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

Improve filtering in AddRemove View

Browse Source 
Make sure to always used the base filtered source queryset.

Remove the grouped attribute which is subclass specific.

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-02-14 02:27:12 -04:00
parent 8589004173
commit 6a57a5a7de
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mayan/apps/common/generics.py
View File

@@ -346,7 +346,6 @@ class MultiFormView(DjangoFormView):
class AddRemoveView(ExternalObjectMixin, ExtraContextMixin, ViewPermissionCheckMixin, RestrictedQuerysetMixin, MultiFormView):
form_classes = {'form_available': ChoiceForm, 'form_added': ChoiceForm}
grouped = False
list_added_help_text = _(
'Select entries to be removed. Hold Control to select multiple '
'entries. Once the selection is complete, click the button below '
@@ -429,18 +428,18 @@ class AddRemoveView(ExternalObjectMixin, ExtraContextMixin, ViewPermissionCheckM
def forms_valid(self, forms):
if 'available-add_all' in self.request.POST:
selection_add = self.get_secondary_object_list()
selection_add = self.get_list_available_queryset()
else:
selection_add = self.get_secondary_object_list().filter(
selection_add = self.get_list_available_queryset().filter(
pk__in=forms['form_available'].cleaned_data['selection']
)
self.action_add(queryset=selection_add)
if 'added-remove_all' in self.request.POST:
selection_remove = self.get_secondary_object_list()
selection_remove = self.get_list_added_queryset()
else:
selection_remove = self.get_secondary_object_list().filter(
selection_remove = self.get_list_added_queryset().filter(
pk__in=forms['form_added'].cleaned_data['selection']
)