Remove the need to use link_spacer for single groups of multi item actions

mayan/apps/acls/__init__.py

@@ -5,7 +5,6 @@ from django.dispatch import receiver
 from south.signals import post_migrate
 
 from navigation.api import register_links
-from navigation.links import link_spacer
 from project_setup.api import register_setup
 
 from .classes import (AccessHolder, AccessObject, AccessObjectClass,
@@ -21,8 +20,8 @@ register_links(AccessObjectClass, [acl_class_acl_list, acl_class_new_holder_for]
 register_links(AccessHolder, [acl_detail])
 register_links(['acls:acl_setup_valid_classes', 'acls:acl_class_acl_list', 'acls:acl_class_new_holder_for', 'acls:acl_class_acl_detail', 'acls:acl_class_multiple_grant', 'acls:acl_class_multiple_revoke'], [acl_class_list], menu_name='secondary_menu')
 register_links(ClassAccessHolder, [acl_class_acl_detail])
-register_links(['acls:acl_detail'], [acl_grant, acl_revoke, link_spacer], menu_name='multi_item_links')
-register_links(['acls:acl_class_acl_detail'], [acl_class_grant, acl_class_revoke, link_spacer], menu_name='multi_item_links')
+register_links(['acls:acl_detail'], [acl_grant, acl_revoke], menu_name='multi_item_links')
+register_links(['acls:acl_class_acl_detail'], [acl_class_grant, acl_class_revoke], menu_name='multi_item_links')
 register_setup(acl_setup_valid_classes)
 
 

mayan/apps/navigation/forms.py

@@ -19,6 +19,9 @@ class MultiItemForm(forms.Form):
             else:
                 group.append(action)
 
-        self.fields['action'].choices = choices
+        if choices:
+            self.fields['action'].choices = choices
+        else:
+            self.fields['action'].choices = group
 
     action = forms.ChoiceField(label=_(u'Actions'), required=False)

mayan/apps/ocr/__init__.py

@@ -31,7 +31,7 @@ logger = logging.getLogger(__name__)
 register_links(Document, [link_document_submit])
 register_links([Document], [link_document_submit_multiple, link_spacer], menu_name='multi_item_links')
 
-register_links([DocumentVersionOCRError], [link_entry_re_queue_multiple, link_entry_delete_multiple, link_spacer], menu_name='multi_item_links')
+register_links([DocumentVersionOCRError], [link_entry_re_queue_multiple, link_entry_delete_multiple], menu_name='multi_item_links')
 register_links([DocumentVersionOCRError], [link_entry_re_queue, link_entry_delete])
 register_links(['ocr:entry_list', 'ocr:entry_delete_multiple', 'ocr:entry_re_queue_multiple', DocumentVersionOCRError], [link_entry_list], menu_name='secondary_menu')
 register_maintenance_links([link_document_all_ocr_cleanup], namespace='ocr', title=_('OCR'))

mayan/apps/permissions/__init__.py

@@ -5,7 +5,6 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.db.models.signals import post_save
 
 from navigation.api import register_links
-from navigation.links import link_spacer
 from project_setup.api import register_setup
 from rest_api.classes import APIEndPoint
 
@@ -17,7 +16,7 @@ from .settings import DEFAULT_ROLES
 
 register_links(Role, [role_edit, role_members, role_permissions, role_delete])
 register_links([Role, 'permissions:role_create', 'permissions:role_list'], [role_list, role_create], menu_name='secondary_menu')
-register_links(['permissions:role_permissions'], [permission_grant, permission_revoke, link_spacer], menu_name='multi_item_links')
+register_links(['permissions:role_permissions'], [permission_grant, permission_revoke], menu_name='multi_item_links')
 
 
 def user_post_save(sender, instance, **kwargs):

mayan/apps/tags/__init__.py

@@ -51,10 +51,10 @@ register_model_list_columns(Document, [
 register_top_menu('tags', link={'text': _(u'Tags'), 'view': 'tags:tag_list', 'famfam': 'tag_blue'})
 
 register_links(Tag, [tag_tagged_item_list, tag_edit, tag_acl_list, tag_delete])
-register_links([Tag], [tag_multiple_delete, link_spacer], menu_name='multi_item_links')
+register_links([Tag], [tag_multiple_delete], menu_name='multi_item_links')
 register_links([Tag, 'tags:tag_list', 'tags:tag_create'], [tag_list, tag_create], menu_name='secondary_menu')
 
 register_links(Document, [tag_document_list], menu_name='form_header')
 register_links(['tags:document_tags', 'tags:tag_remove', 'tags:tag_multiple_remove', 'tags:tag_attach'], [tag_attach], menu_name='sidebar')
-register_links(['tags:document_tags'], [single_document_multiple_tag_remove, link_spacer], menu_name='multi_item_links')
+register_links(['tags:document_tags'], [single_document_multiple_tag_remove], menu_name='multi_item_links')
 register_links([Document], [tag_multiple_attach, multiple_documents_selection_tag_remove, link_spacer], menu_name='multi_item_links')

mayan/apps/user_management/__init__.py

@@ -16,11 +16,11 @@ from .links import (group_add, group_delete, group_edit, group_list,
 
 register_links(User, [user_edit, user_set_password, user_groups, user_delete])
 register_links([User, 'user_management:user_multiple_set_password', 'user_management:user_multiple_delete', 'user_management:user_list', 'user_management:user_add'], [user_list, user_add], menu_name=u'secondary_menu')
-register_links(['user_management:user_list'], [user_multiple_set_password, user_multiple_delete, link_spacer], menu_name='multi_item_links')
+register_links(['user_management:user_list'], [user_multiple_set_password, user_multiple_delete], menu_name='multi_item_links')
 
 register_links(Group, [group_edit, group_members, group_delete])
 register_links(['user_management:group_multiple_delete', 'user_management:group_delete', 'user_management:group_edit', 'user_management:group_list', 'user_management:group_add', 'user_management:group_members'], [group_list, group_add], menu_name=u'secondary_menu')
-register_links(['user_management:group_list'], [group_multiple_delete, link_spacer], menu_name='multi_item_links')
+register_links(['user_management:group_list'], [group_multiple_delete], menu_name='multi_item_links')
 
 register_setup(user_setup)
 register_setup(group_setup)