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

Fix multi document tag attach and remove

Browse Source
This commit is contained in:
Roberto Rosario
2015-04-06 00:16:28 -04:00
parent 314a04bb22
commit eae3b0eba2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/tags/apps.py
View File

@@ -15,11 +15,10 @@ from navigation.api import register_model_list_columns
from rest_api.classes import APIEndPoint
from .links import (
link_multiple_documents_selection_tag_remove,
link_multiple_documents_attach_tag, link_multiple_documents_tag_remove,
link_single_document_multiple_tag_remove, link_tag_acl_list,
link_tag_attach, link_tag_create, link_tag_delete, link_tag_document_list,
link_tag_edit, link_tag_list, link_tag_multiple_attach,
link_tag_multiple_delete, link_tag_tagged_item_list
link_tag_edit, link_tag_list, link_tag_multiple_delete, link_tag_tagged_item_list
)
from .models import Tag
from .permissions import (
@@ -45,6 +44,7 @@ class TagsApp(apps.AppConfig):
menu_facet.bind_links(links=[link_tag_document_list], sources=[Document])
menu_main.bind_links(links=[link_tag_list])
menu_multi_item.bind_links(links=[link_multiple_documents_attach_tag, link_multiple_documents_tag_remove], sources=[Document])
menu_multi_item.bind_links(links=[link_tag_multiple_delete], sources=[Tag])
menu_multi_item.bind_links(links=[link_single_document_multiple_tag_remove], sources=[CombinedSource(obj=Tag, view='tags:document_tags')])
menu_object.bind_links(links=[link_tag_tagged_item_list, link_tag_edit, link_tag_acl_list, link_tag_delete], sources=[Tag])

4
mayan/apps/tags/links.py
View File

@@ -11,7 +11,8 @@ from .permissions import (
)
link_multiple_documents_selection_tag_remove = Link(text=_('Remove tag'), view='tags:multiple_documents_selection_tag_remove')
link_multiple_documents_tag_remove = Link(text=_('Remove tag'), view='tags:multiple_documents_selection_tag_remove')
link_multiple_documents_attach_tag = Link(text=_('Attach tag'), view='tags:multiple_documents_tag_attach')
link_single_document_multiple_tag_remove = Link(permissions=[PERMISSION_TAG_REMOVE], text=_('Remove tags'), view='tags:single_document_multiple_tag_remove', args='document.id')
link_tag_acl_list = Link(permissions=[ACLS_VIEW_ACL], text=_('ACLs'), view='tags:tag_acl_list', args='object.pk')
link_tag_attach = Link(permissions=[PERMISSION_TAG_ATTACH], text=_('Attach tag'), view='tags:tag_attach', args='object.pk')
@@ -20,6 +21,5 @@ link_tag_delete = Link(permissions=[PERMISSION_TAG_DELETE], text=_('Delete'), vi
link_tag_edit = Link(permissions=[PERMISSION_TAG_EDIT], text=_('Edit'), view='tags:tag_edit', args='object.id')
link_tag_document_list = Link(permissions=[PERMISSION_TAG_REMOVE, PERMISSION_TAG_ATTACH], text=_('Tags'), view='tags:document_tags', args='object.pk')
link_tag_list = Link(icon='fa fa-tag', text=_('Tags'), view='tags:tag_list')
link_tag_multiple_attach = Link(text=_('Attach tag'), view='tags:tag_multiple_attach')
link_tag_multiple_delete = Link(permissions=[PERMISSION_TAG_DELETE], text=_('Delete'), view='tags:tag_multiple_delete')
link_tag_tagged_item_list = Link(text=('Documents'), view='tags:tag_tagged_item_list', args='object.id')

2
mayan/apps/tags/urls.py
View File

@@ -20,7 +20,7 @@ urlpatterns = patterns('tags.views',
url(r'^multiple/remove/document/multiple/$', 'multiple_documents_selection_tag_remove', (), 'multiple_documents_selection_tag_remove'),
url(r'^selection/attach/document/(?P<document_id>\d+)/$', 'tag_attach', (), 'tag_attach'),
url(r'^selection/attach/document/multiple/$', 'tag_multiple_attach', (), 'tag_multiple_attach'),
url(r'^selection/attach/document/multiple/$', 'tag_multiple_attach', (), 'multiple_documents_tag_attach'),
url(r'^for/document/(?P<document_id>\d+)/$', 'document_tags', (), 'document_tags'),