matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport ACL computation improvements

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-05-04 03:27:30 -04:00
parent d271f1503d
commit 8e731d6280
61 changed files with 701 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mayan/apps/mailer/views.py
View File

@@ -85,8 +85,8 @@ class MailDocumentView(MultipleObjectFormActionView):
def object_action(self, form, instance):
AccessControlList.objects.check_access(
permissions=permission_user_mailer_use, user=self.request.user,
obj=form.cleaned_data['user_mailer']
obj=form.cleaned_data['user_mailer'],
permissions=(permission_user_mailer_use,), user=self.request.user
)
task_send_document.apply_async(
@@ -261,8 +261,8 @@ class UserMailerTestView(FormView):
def get_object(self):
user_mailer = get_object_or_404(klass=UserMailer, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
permissions=permission_user_mailer_use, user=self.request.user,
obj=user_mailer
obj=user_mailer, permissions=(permission_user_mailer_use,),
user=self.request.user
)
return user_mailer