From 6c7ea8432d5ffc431d37b0f8726443d23ab6f9eb Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 19 Jul 2023 00:02:49 +0200 Subject: 🐛 Fix document quick packaging (#5611) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog/en/changelog_2022-06-15.md | 1 + changelog/fr/changelog_2023-01-25.md | 1 + ishtar_common/forms_common.py | 10 +++++----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/changelog/en/changelog_2022-06-15.md b/changelog/en/changelog_2022-06-15.md index 6bc6bca3c..14523066f 100644 --- a/changelog/en/changelog_2022-06-15.md +++ b/changelog/en/changelog_2022-06-15.md @@ -13,6 +13,7 @@ v4.0.54 - 2099-12-31 ### Bug fixes ### - fix find redirection after geo item creation/modification - account form: fix slugify of default username +- fix document quick packaging (#5611) v4.0.53 - 2023-07-06 -------------------- diff --git a/changelog/fr/changelog_2023-01-25.md b/changelog/fr/changelog_2023-01-25.md index 55b4229bd..d682637b5 100644 --- a/changelog/fr/changelog_2023-01-25.md +++ b/changelog/fr/changelog_2023-01-25.md @@ -13,6 +13,7 @@ v4.0.54 - 2099-12-31 ### Corrections de dysfonctionnements ### - correction de redirection sur le mobilier après ajout/édition d'élément géographique - formulaire de compte : correction de la normalisation du nom d'utilisateur +- correction de l'action de conditionnement rapide (#5611) v4.0.53 - 2023-07-06 -------------------- diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index fa0cff575..0f076a9a1 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -2456,19 +2456,19 @@ class QADocumentPackagingForm(IshtarForm): super(QADocumentPackagingForm, self).__init__(*args, **kwargs) def save(self, items, user): - container = Container.objects.get(pk=self.cleaned_data["container"]) + container_id = Container.objects.get(pk=self.cleaned_data["container"]).pk container_to_change = self.cleaned_data.get("container_to_change", "") container_attrs = [] if container_to_change in ("reference", "current-and-reference"): - container_attrs.append("container_ref") + container_attrs.append("container_ref_id") if container_to_change in ("current", "current-and-reference"): - container_attrs.append("container") + container_attrs.append("container_id") for document in items: changed = False for container_attr in container_attrs: - if getattr(document, container_attr) == container: + if getattr(document, container_attr) == container_id: continue - setattr(document, container_attr, container) + setattr(document, container_attr, container_id) changed = True if changed: document.history_modifier = user -- cgit v1.2.3