Add permission inheritance by parent object. Add ACLs app model tests.

mayan/apps/common/forms.py

@@ -11,7 +11,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from .models import UserLocaleProfile
 from .utils import return_attrib
-from .widgets import DetailSelectMultiple, PlainWidget
+from .widgets import DetailSelectMultiple, DisableableSelectWidget, PlainWidget
 
 
 class DetailForm(forms.ModelForm):
@@ -57,24 +57,6 @@ class DetailForm(forms.ModelForm):
             self.fields[field_name].widget.attrs.update({'readonly': 'readonly'})
 
 
-class GenericAssignRemoveForm(forms.Form):
-    def __init__(self, *args, **kwargs):
-        left_list_qryset = kwargs.pop('left_list_qryset', None)
-        right_list_qryset = kwargs.pop('right_list_qryset', None)
-        left_filter = kwargs.pop('left_filter', None)
-        super(GenericAssignRemoveForm, self).__init__(*args, **kwargs)
-        if left_filter:
-            self.fields['left_list'].queryset = left_list_qryset.filter(
-                *left_filter)
-        else:
-            self.fields['left_list'].queryset = left_list_qryset
-
-        self.fields['right_list'].queryset = right_list_qryset
-
-    left_list = forms.ModelMultipleChoiceField(required=False, queryset=None)
-    right_list = forms.ModelMultipleChoiceField(required=False, queryset=None)
-
-
 class ChoiceForm(forms.Form):
     """
     Form to be used in side by side templates used to add or remove
@@ -83,12 +65,16 @@ class ChoiceForm(forms.Form):
     def __init__(self, *args, **kwargs):
         choices = kwargs.pop('choices', [])
         label = kwargs.pop('label', _('Selection'))
+        help_text = kwargs.pop('help_text', None)
+        disabled_choices = kwargs.pop('disabled_choices', ())
         super(ChoiceForm, self).__init__(*args, **kwargs)
         self.fields['selection'].choices = choices
         self.fields['selection'].label = label
+        self.fields['selection'].help_text = help_text
+        self.fields['selection'].widget.disabled_choices = disabled_choices
         self.fields['selection'].widget.attrs.update({'size': 14, 'class': 'choice_form'})
 
-    selection = forms.MultipleChoiceField()
+    selection = forms.MultipleChoiceField(widget=DisableableSelectWidget())
 
 
 class UserForm_view(DetailForm):

mayan/apps/common/views.py

@@ -33,7 +33,7 @@ from .mixins import (
 )
 
 
-class AssignRemoveView(ViewPermissionCheckMixin, ObjectPermissionCheckMixin, TemplateView):
+class AssignRemoveView(ExtraContextMixin, ViewPermissionCheckMixin, ObjectPermissionCheckMixin, TemplateView):
     decode_content_type = False
     extra_context = None
     grouped = False
@@ -75,9 +75,15 @@ class AssignRemoveView(ViewPermissionCheckMixin, ObjectPermissionCheckMixin, Tem
         # Subclass must override
         raise NotImplementedError
 
+    def get_disabled_choices(self):
+        return ()
+
+    def get_help_text(self):
+        return self.help_text
+
     def get(self, request, *args, **kwargs):
         self.unselected_list = ChoiceForm(prefix=self.LEFT_LIST_NAME, choices=self.left_list())
-        self.selected_list = ChoiceForm(prefix=self.RIGHT_LIST_NAME, choices=self.right_list())
+        self.selected_list = ChoiceForm(prefix=self.RIGHT_LIST_NAME, choices=self.right_list(), disabled_choices=self.get_disabled_choices(), help_text=self.get_help_text())
         return self.render_to_response(self.get_context_data())
 
     def process_form(self, prefix, items_function, action_function):