diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-11-06 18:02:09 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-11-06 18:02:09 +0100 |
| commit | 7aff689b1f7b79e029561d18f8b94add448eec08 (patch) | |
| tree | a09ab49aafd41738737a4ecc9f37a11845751c74 /archaeological_finds/forms.py | |
| parent | 34e050c2094352110667266cce40564368c20253 (diff) | |
| parent | d41e1ddc64dbf59f10cc816ddd4904168cf96d51 (diff) | |
| download | Ishtar-7aff689b1f7b79e029561d18f8b94add448eec08.tar.bz2 Ishtar-7aff689b1f7b79e029561d18f8b94add448eec08.zip | |
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 1f81cf52f..87aaf76a9 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -787,7 +787,7 @@ class FindBasketAddItemForm(forms.Form): def save(self, user): try: basket = models.FindBasket.objects.get( - pk=self.cleaned_data['basket_id'], user=user.ishtaruser) + pk=self.cleaned_data['basket_id'], user=user) item = models.Find.objects.get( pk=self.cleaned_data['item_id']) except models.FindBasket.DoesNotExist or\ @@ -795,9 +795,9 @@ class FindBasketAddItemForm(forms.Form): # something strange... TODO: log it raise PermissionDenied # check rights - if not user.is_superuser and \ - not user.ishtaruser.has_right('change_find') and \ - not (user.ishtaruser.has_right('change_own_find') + if not user.user_ptr.is_superuser and \ + not user.has_right('change_find') and \ + not (user.has_right('change_own_find') and item.is_own(user)): raise PermissionDenied basket.items.add(item) |