From f5eafb0ca0af3ed064202abbe99bfbeef8bbb74d Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Thu, 17 Nov 2022 08:21:42 -0700 Subject: Add image/icon upload --- users/views/admin.py | 52 ++-------------------------------------------------- 1 file changed, 2 insertions(+), 50 deletions(-) (limited to 'users/views/admin.py') diff --git a/users/views/admin.py b/users/views/admin.py index c1210f1..165572c 100644 --- a/users/views/admin.py +++ b/users/views/admin.py @@ -1,6 +1,4 @@ import re -from functools import partial -from typing import ClassVar, Dict from django import forms from django.db import models @@ -11,6 +9,7 @@ from django.views.generic import FormView, RedirectView, TemplateView from core.models import Config from users.decorators import admin_required from users.models import Domain, Identity, User +from users.views.settings import SettingsPage @method_decorator(admin_required, name="dispatch") @@ -19,7 +18,7 @@ class AdminRoot(RedirectView): @method_decorator(admin_required, name="dispatch") -class AdminSettingsPage(FormView): +class AdminSettingsPage(SettingsPage): """ Shows a settings page dynamically created from our settings layout at the bottom of the page. Don't add this to a URL directly - subclass! @@ -27,32 +26,6 @@ class AdminSettingsPage(FormView): template_name = "admin/settings.html" options_class = Config.SystemOptions - section: ClassVar[str] - options: Dict[str, Dict[str, str]] - - def get_form_class(self): - # Create the fields dict from the config object - fields = {} - for key, details in self.options.items(): - config_field = self.options_class.__fields__[key] - if config_field.type_ is bool: - form_field = partial( - forms.BooleanField, - widget=forms.Select( - choices=[(True, "Enabled"), (False, "Disabled")] - ), - ) - elif config_field.type_ is str: - form_field = forms.CharField - else: - raise ValueError(f"Cannot render settings type {config_field.type_}") - fields[key] = form_field( - label=details["title"], - help_text=details.get("help_text", ""), - required=details.get("required", False), - ) - # Create a form class dynamically (yeah, right?) and return that - return type("SettingsForm", (forms.Form,), fields) def load_config(self): return Config.load_system() @@ -60,27 +33,6 @@ class AdminSettingsPage(FormView): def save_config(self, key, value): Config.set_system(key, value) - def get_initial(self): - config = self.load_config() - initial = {} - for key in self.options.keys(): - initial[key] = getattr(config, key) - return initial - - def get_context_data(self): - context = super().get_context_data() - context["section"] = self.section - return context - - def form_valid(self, form): - # Save each key - for field in form: - self.save_config( - field.name, - form.cleaned_data[field.name], - ) - return redirect(".") - class BasicPage(AdminSettingsPage): -- cgit v1.2.3