From 72bdd7743554cc767aea83c87ee44e174398beac Mon Sep 17 00:00:00 2001 From: Lucas Brandstaetter <lucas@brandstaetter.tech> Date: Sun, 27 Oct 2024 09:37:03 +0100 Subject: [PATCH] Remove create parameter from ProjectForm This can be determined by checking if the instance is None. Which is the way Django does it. --- .../templates/backoffice/project/create_edit.html | 2 +- src/backoffice/views/projects.py | 12 ------------ src/core/forms.py | 6 +++--- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/backoffice/templates/backoffice/project/create_edit.html b/src/backoffice/templates/backoffice/project/create_edit.html index d074807db..2a59c4f6b 100644 --- a/src/backoffice/templates/backoffice/project/create_edit.html +++ b/src/backoffice/templates/backoffice/project/create_edit.html @@ -142,7 +142,7 @@ </div> </div> {% include 'backoffice/link/link_display.html' with links=project.links %} - {% trans 'Project__submit' as button_text%} + {% trans 'Project__submit' as button_text %} <div class="card-footer"> {% bootstrap_button button_text button_type="submit" button_class="btn-primary float-end" %} </div> diff --git a/src/backoffice/views/projects.py b/src/backoffice/views/projects.py index b4c7061dd..c38dccb6a 100644 --- a/src/backoffice/views/projects.py +++ b/src/backoffice/views/projects.py @@ -187,24 +187,12 @@ class CreateProjectView(SoProjectFormMixin, CreateView): self.object = None return super().post(request, *args, **kwargs) - def get_form_kwargs(self) -> dict[str, Any]: - return { - **super().get_form_kwargs(), - 'create': True, - } - class AssemblyCreateProjectView(AssemblyProjectFormMixin, CreateView): def post(self, request: HttpRequest, *args: str, **kwargs: Any) -> HttpResponse: self.object = None return super().post(request, *args, **kwargs) - def get_form_kwargs(self) -> dict[str, Any]: - return { - **super().get_form_kwargs(), - 'create': True, - } - class ProjectView(SoProjectFormMixin, UpdateView): def post(self, request: HttpRequest, *args: str, **kwargs: Any) -> HttpResponse: diff --git a/src/core/forms.py b/src/core/forms.py index 5e4f619ec..86a57d08f 100644 --- a/src/core/forms.py +++ b/src/core/forms.py @@ -270,16 +270,16 @@ class ProjectForm(TranslatedFieldsForm): conference, assembly: Assembly | None = None, owner: PlatformUser | None = None, - create: bool = False, + instance: Project | None = None, publish: bool = False, **kwargs, ): self.conference = conference - self.create = create self.assembly = assembly self.owner = owner self.publish = publish - super().__init__(*args, **kwargs) + self.create = instance is None + super().__init__(*args, instance=instance, **kwargs) if self.instance.pk: self.initial['tags_list'] = ', '.join(self.instance.sorted_tags) -- GitLab