From ff8681360e589ff3c8e63dcef6ad0d31ac8ecab8 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 24 Sep 2019 10:33:07 +0200 Subject: Allow own locker to edit their locks --- ishtar_common/forms.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ishtar_common/forms.py') diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index c9c88b805..a7774df1f 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -383,11 +383,13 @@ class CustomFormSearch(forms.Form): if 'user' in kwargs: user = kwargs.pop('user') super(CustomFormSearch, self).__init__(*args, **kwargs) + self.request_user = user if user and 'pk' in self.fields: self.fields['pk'].widget.user = user class LockForm(object): + need_user_for_initialization = True associated_models = {} def clean(self): @@ -412,7 +414,7 @@ class LockForm(object): item = model.objects.get(pk=pk) except model.DoesNotExist: raise forms.ValidationError(_("Invalid selection.")) - if item.locked: + if item.is_locked(self.request_user): raise forms.ValidationError(_("This item is locked " "for edition.")) return self.cleaned_data -- cgit v1.2.3