diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-04-09 14:03:37 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-04-09 14:04:25 +0200 |
| commit | 05415db1c4297ecbbcce470e3bea4154e626feab (patch) | |
| tree | 48a7100f357411f7598593c438c12caade081bde /archaeological_finds | |
| parent | b3a7f49ee451e3e0ba944c3d1fa8d5510a382988 (diff) | |
| download | Ishtar-05415db1c4297ecbbcce470e3bea4154e626feab.tar.bz2 Ishtar-05415db1c4297ecbbcce470e3bea4154e626feab.zip | |
QA: fix add to basket when shared with several users - preserve basket order on duplicate
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 843d082fe..7cbbca81c 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -752,7 +752,7 @@ class QAFindBasketForm(IshtarForm): def save(self, items): if self.cleaned_data['qa_bf_create_or_update'] == 'update': q = Q(user=self.user) | Q(shared_write_with__pk=self.user.pk) - basket = models.FindBasket.objects.filter(q).get( + basket = models.FindBasket.objects.filter(q).distinct().get( pk=self.cleaned_data['qa_bf_basket']) else: label = self.cleaned_data['qa_bf_label'].strip() diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 328821386..25563edd0 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -55,13 +55,13 @@ from archaeological_warehouse.models import Warehouse class MaterialType(HierarchicalType): - code = models.CharField(_(u"Code"), max_length=10, blank=True, null=True) - recommendation = models.TextField(_(u"Recommendation"), blank=True, + code = models.CharField(_("Code"), max_length=10, blank=True, null=True) + recommendation = models.TextField(_("Recommendation"), blank=True, null=True) class Meta: - verbose_name = _(u"Material type") - verbose_name_plural = _(u"Material types") + verbose_name = _("Material type") + verbose_name_plural = _("Material types") ordering = ('label',) |