Refactor NGO account settings and forms

- update URLs and templates for better organization

Author: tudoramariei

backend/donations/forms/ngo_account.py

@@ -10,8 +10,6 @@
 
 
 class NgoPresentationForm(forms.Form):
-    is_accepting_forms = forms.BooleanField(label=_("Is accepting forms"), required=False)
-
     name = forms.CharField(label=_("Name"), max_length=255, required=True)
     if settings.ENABLE_FULL_VALIDATION_CUI:
         cif = ROCIFField(label=_("CUI/CIF"), required=True)
@@ -100,6 +98,8 @@ def clean_contact_phone(self):
 
 
 class NgoFormForm(forms.Form):
+    is_accepting_forms = forms.BooleanField(label=_("Is accepting forms"), required=False)
+
     slug = forms.CharField(label=_("Slug"), max_length=150, required=True)
     description = forms.CharField(label=_("Description"), widget=forms.Textarea, required=True)
 

backend/donations/urls_ngo_account.py

@@ -9,7 +9,7 @@
     NgoFormsView,
     NgoPresentationView,
     NgoRedirectionsView,
-    NgoSettingsView,
+    UserSettingsView,
 )
 
 admin.site.site_header = f"Admin | {settings.VERSION_LABEL}"
@@ -23,6 +23,6 @@
     path("formulare/", NgoFormsView.as_view(), name="forms"),
     path("redirectionari/", NgoRedirectionsView.as_view(), name="redirections"),
     path("arhive/", NgoArchivesView.as_view(), name="archives"),
-    path("settings/", NgoSettingsView.as_view(), name="settings"),
+    path("setari-cont/", UserSettingsView.as_view(), name="settings-account"),
     path("arhiva/<job_id>/", ArchiveDownloadLinkView.as_view(), name="archive-download-link"),
 ]

backend/donations/views/ngo_account.py

@@ -213,7 +213,6 @@ def post(self, request, *args, **kwargs):
             ngo.locality = form.cleaned_data["locality"]
             ngo.active_region = form.cleaned_data["active_region"]
 
-        ngo.is_accepting_forms = form.cleaned_data["is_accepting_forms"]
         ngo.display_email = form.cleaned_data["display_email"]
         ngo.display_phone = form.cleaned_data["display_phone"]
 
@@ -309,6 +308,8 @@ def post(self, request, *args, **kwargs):
         ngo.bank_account = form.cleaned_data["iban"]
         ngo.description = form.cleaned_data["description"]
 
+        ngo.is_accepting_forms = form.cleaned_data["is_accepting_forms"]
+
         if errors:
             return render(request, self.template_name, context)
 
@@ -322,10 +323,10 @@ def post(self, request, *args, **kwargs):
         return render(request, self.template_name, context)
 
 
-class NgoSettingsView(NgoBaseTemplateView):
-    template_name = "ngo-account/settings/main.html"
+class UserSettingsView(NgoBaseTemplateView):
+    template_name = "ngo-account/settings-account/main.html"
     title = _("Organization settings")
-    sidebar_item_target = "org-settings"
+    sidebar_item_target = "user-settings"
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)