diff --git a/gnuviechadmin/contact_form/locale/de/LC_MESSAGES/django.po b/gnuviechadmin/contact_form/locale/de/LC_MESSAGES/django.po index 6666a9c..aaf030a 100644 --- a/gnuviechadmin/contact_form/locale/de/LC_MESSAGES/django.po +++ b/gnuviechadmin/contact_form/locale/de/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: contact_form\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-22 13:01+0200\n" -"PO-Revision-Date: 2023-04-22 13:01+0200\n" +"POT-Creation-Date: 2023-04-16 22:07+0200\n" +"PO-Revision-Date: 2023-04-16 18:25+0200\n" "Last-Translator: Jan Dittberner \n" "Language-Team: Jan Dittberner \n" "Language: de\n" @@ -34,14 +34,3 @@ msgstr "Ihre Nachricht" #: contact_form/forms.py:39 msgid "Send message" msgstr "Nachricht senden" - -#: contact_form/templates/contact_form/contact_form.html:4 -#: contact_form/templates/contact_form/contact_form.html:5 -#: contact_form/templates/contact_form/contact_success.html:4 -#: contact_form/templates/contact_form/contact_success.html:5 -msgid "Contact" -msgstr "Kontakt" - -#: contact_form/templates/contact_form/contact_success.html:8 -msgid "Your message has been sent successfully." -msgstr "Ihre Nachricht wurde erfolgreich übermittelt." diff --git a/gnuviechadmin/hostingpackages/locale/de/LC_MESSAGES/django.po b/gnuviechadmin/hostingpackages/locale/de/LC_MESSAGES/django.po index dd5bfb2..c068c93 100644 --- a/gnuviechadmin/hostingpackages/locale/de/LC_MESSAGES/django.po +++ b/gnuviechadmin/hostingpackages/locale/de/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gnuviechadmin hostingpackages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-22 13:14+0200\n" -"PO-Revision-Date: 2023-04-22 13:15+0200\n" +"POT-Creation-Date: 2023-04-16 22:07+0200\n" +"PO-Revision-Date: 2023-04-16 19:10+0200\n" "Last-Translator: Jan Dittberner \n" "Language-Team: Jan Dittberner \n" "Language: de\n" @@ -233,19 +233,15 @@ msgid "Customer" msgstr "Kunde" #: hostingpackages/templates/hostingpackages/customerhostingpackage_admin_list.html:13 -msgid "OS User" -msgstr "OS-Nutzer" - -#: hostingpackages/templates/hostingpackages/customerhostingpackage_admin_list.html:14 #: hostingpackages/templates/hostingpackages/customerhostingpackage_list.html:27 msgid "Setup date" msgstr "Einrichtungsdatum" -#: hostingpackages/templates/hostingpackages/customerhostingpackage_admin_list.html:31 +#: hostingpackages/templates/hostingpackages/customerhostingpackage_admin_list.html:29 msgid "No hosting packages have been setup yet." msgstr "Es wurden noch keine Hostingpakete eingerichtet." -#: hostingpackages/templates/hostingpackages/customerhostingpackage_admin_list.html:34 +#: hostingpackages/templates/hostingpackages/customerhostingpackage_admin_list.html:32 #: hostingpackages/templates/hostingpackages/customerhostingpackage_list.html:46 msgid "Add hosting package" msgstr "Hostingpaket anlegen" @@ -288,7 +284,7 @@ msgid "Description" msgstr "Beschreibung" #: hostingpackages/templates/hostingpackages/customerhostingpackage_detail.html:40 -#: hostingpackages/views.py:199 +#: hostingpackages/views.py:190 msgid "Disk space" msgstr "Speicherplatz" @@ -309,7 +305,7 @@ msgstr "" "der Unterschied ergibt sich aus Speicherplatzoptionen" #: hostingpackages/templates/hostingpackages/customerhostingpackage_detail.html:52 -#: hostingpackages/views.py:206 +#: hostingpackages/views.py:197 msgid "Mailboxes" msgstr "Postfächer" @@ -491,7 +487,7 @@ msgid "Add mailbox" msgstr "Postfach hinzufügen" #: hostingpackages/templates/hostingpackages/customerhostingpackage_detail.html:237 -#: hostingpackages/views.py:213 +#: hostingpackages/views.py:204 msgid "Databases" msgstr "Datenbanken" @@ -570,7 +566,7 @@ msgstr "" msgid "Started setup of new hosting package {name}." msgstr "Einrichtung des Hostingpakets {name} wurde gestartet." -#: hostingpackages/views.py:287 +#: hostingpackages/views.py:278 #, python-brace-format msgid "Successfully added option {option} to hosting package {package}." msgstr "Option {option} erfolgreich zum Hostingpaket {package} hinzugefügt." diff --git a/gnuviechadmin/hostingpackages/templates/hostingpackages/customerhostingpackage_admin_list.html b/gnuviechadmin/hostingpackages/templates/hostingpackages/customerhostingpackage_admin_list.html index a4b7727..5476caf 100644 --- a/gnuviechadmin/hostingpackages/templates/hostingpackages/customerhostingpackage_admin_list.html +++ b/gnuviechadmin/hostingpackages/templates/hostingpackages/customerhostingpackage_admin_list.html @@ -10,7 +10,6 @@ {% translate "Name" %} {% translate "Customer" %} - {% translate "OS User" %} {% translate "Setup date" %} @@ -21,7 +20,6 @@ {{ package.customer }} - {{ package.osuser.username }} {{ package.created }} {% endfor %} diff --git a/gnuviechadmin/hostingpackages/views.py b/gnuviechadmin/hostingpackages/views.py index d94f296..038acb2 100644 --- a/gnuviechadmin/hostingpackages/views.py +++ b/gnuviechadmin/hostingpackages/views.py @@ -38,19 +38,19 @@ class CreateHostingPackage(PermissionRequiredMixin, CreateView): model = CustomerHostingPackage raise_exception = True - permission_required = "domains.add_customerhostingpackage" + permission_required = 'domains.add_customerhostingpackage' template_name_suffix = "_create" form_class = CreateHostingPackageForm def form_valid(self, form): - hosting_package = form.save() + hostingpackage = form.save() messages.success( self.request, _("Started setup of new hosting package {name}.").format( - name=hosting_package.name + name=hostingpackage.name ), ) - return redirect(hosting_package) + return redirect(hostingpackage) class CreateCustomerHostingPackage(CreateHostingPackage): @@ -75,16 +75,16 @@ class CreateCustomerHostingPackage(CreateHostingPackage): return context def form_valid(self, form): - hosting_package = form.save(commit=False) - hosting_package.customer = self.get_customer_object() - hosting_package.save() + hostingpackage = form.save(commit=False) + hostingpackage.customer = self.get_customer_object() + hostingpackage.save() messages.success( self.request, _("Started setup of new hosting package {name}.").format( - name=hosting_package.name + name=hostingpackage.name ), ) - return redirect(hosting_package) + return redirect(hostingpackage) class CustomerHostingPackageDetails(StaffOrSelfLoginRequiredMixin, DetailView): @@ -126,7 +126,6 @@ class StaffUserRequiredMixin(UserPassesTestMixin): Mixin to make views available to staff members only. """ - def test_func(self): return self.request.user.is_staff @@ -140,14 +139,6 @@ class AllCustomerHostingPackageList(StaffUserRequiredMixin, ListView): model = CustomerHostingPackage template_name_suffix = "_admin_list" - def get_queryset(self): - return ( - super() - .get_queryset() - .select_related("osuser", "customer") - .only("name", "pk", "created", "customer__username", "osuser__username") - ) - class CustomerHostingPackageList(StaffOrSelfLoginRequiredMixin, ListView): """ diff --git a/gnuviechadmin/locale/de/LC_MESSAGES/django.po b/gnuviechadmin/locale/de/LC_MESSAGES/django.po index a2fe68d..504f6ff 100644 --- a/gnuviechadmin/locale/de/LC_MESSAGES/django.po +++ b/gnuviechadmin/locale/de/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: gnuviechadmin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-22 13:01+0200\n" -"PO-Revision-Date: 2023-04-22 12:58+0200\n" +"POT-Creation-Date: 2023-04-16 22:07+0200\n" +"PO-Revision-Date: 2023-04-16 21:37+0200\n" "Last-Translator: Jan Dittberner \n" "Language-Team: Jan Dittberner \n" "Language: de\n" @@ -455,7 +455,10 @@ msgstr "Impressum" msgid "Privacy policy" msgstr "Datenschutz" -#: templates/base.html:78 +#: templates/base.html:78 templates/contact_form/contact_form.html:4 +#: templates/contact_form/contact_form.html:5 +#: templates/contact_form/contact_success.html:4 +#: templates/contact_form/contact_success.html:5 msgid "Contact" msgstr "Kontakt" @@ -511,6 +514,10 @@ msgstr "Abmelden" msgid "Close" msgstr "Schließen" +#: templates/contact_form/contact_success.html:8 +msgid "Your message has been sent successfully." +msgstr "Ihre Nachricht wurde erfolgreich übermittelt." + #: templates/domains/hostingdomain_create.html:4 #: templates/domains/hostingdomain_create.html:7 #, python-format @@ -539,15 +546,11 @@ msgstr "Django Impersonate - Nutzersuche" msgid "Enter Search Query:" msgstr "Suchanfrage eingeben:" -#: templates/impersonate/search_users.html:13 -msgid "user name part" -msgstr "Nutzernamen-Bestandteile" - #: templates/impersonate/search_users.html:15 msgid "Search" msgstr "Suchen" -#: templates/impersonate/search_users.html:16 +#: templates/impersonate/search_users.html:19 msgid "List all users" msgstr "Alle Nutzer auflisten" diff --git a/gnuviechadmin/contact_form/templates/contact_form/base.html b/gnuviechadmin/templates/contact_form/base.html similarity index 100% rename from gnuviechadmin/contact_form/templates/contact_form/base.html rename to gnuviechadmin/templates/contact_form/base.html diff --git a/gnuviechadmin/contact_form/templates/contact_form/contact_form.html b/gnuviechadmin/templates/contact_form/contact_form.html similarity index 100% rename from gnuviechadmin/contact_form/templates/contact_form/contact_form.html rename to gnuviechadmin/templates/contact_form/contact_form.html diff --git a/gnuviechadmin/contact_form/templates/contact_form/contact_form.txt b/gnuviechadmin/templates/contact_form/contact_form.txt similarity index 100% rename from gnuviechadmin/contact_form/templates/contact_form/contact_form.txt rename to gnuviechadmin/templates/contact_form/contact_form.txt diff --git a/gnuviechadmin/contact_form/templates/contact_form/contact_form_subject.txt b/gnuviechadmin/templates/contact_form/contact_form_subject.txt similarity index 100% rename from gnuviechadmin/contact_form/templates/contact_form/contact_form_subject.txt rename to gnuviechadmin/templates/contact_form/contact_form_subject.txt diff --git a/gnuviechadmin/contact_form/templates/contact_form/contact_success.html b/gnuviechadmin/templates/contact_form/contact_success.html similarity index 100% rename from gnuviechadmin/contact_form/templates/contact_form/contact_success.html rename to gnuviechadmin/templates/contact_form/contact_success.html