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

Started the rename of the document grouping app to smart linking

Browse Source
This commit is contained in:
Roberto Rosario
2011-11-18 18:29:59 -04:00
parent 96e92b296e
commit 1f784aa6b0
8 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/grouping/__init__.py
View File

@@ -9,22 +9,22 @@ from documents.models import Document
from grouping.models import DocumentGroup
PERMISSION_DOCUMENT_GROUP_VIEW = {'namespace': 'grouping', 'name': 'group_view', 'label': _(u'View existing document groups')}
PERMISSION_DOCUMENT_GROUP_CREATE = {'namespace': 'grouping', 'name': 'group_create', 'label': _(u'Create new document groups')}
PERMISSION_DOCUMENT_GROUP_DELETE = {'namespace': 'grouping', 'name': 'group_delete', 'label': _(u'Delete document groups')}
PERMISSION_SMART_LINK_VIEW = {'namespace': 'grouping', 'name': 'group_view', 'label': _(u'View existing smart links')}
PERMISSION_SMART_LINK_CREATE = {'namespace': 'grouping', 'name': 'group_create', 'label': _(u'Create new smart links')}
PERMISSION_SMART_LINK_DELETE = {'namespace': 'grouping', 'name': 'group_delete', 'label': _(u'Delete smart links')}
set_namespace_title('grouping', _(u'Grouping'))
register_permission(PERMISSION_DOCUMENT_GROUP_VIEW)
register_permission(PERMISSION_DOCUMENT_GROUP_CREATE)
register_permission(PERMISSION_DOCUMENT_GROUP_DELETE)
set_namespace_title('grouping', _(u'Smart links'))
register_permission(PERMISSION_SMART_LINK_VIEW)
register_permission(PERMISSION_SMART_LINK_CREATE)
register_permission(PERMISSION_SMART_LINK_DELETE)
document_group_link = {'text': _(u'group actions'), 'view': 'document_group_view', 'famfam': 'package_go', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
groups_for_document = {'text': _(u'groups'), 'view': 'groups_for_document', 'args': 'object.pk', 'famfam': 'package_go', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
document_group_link = {'text': _(u'smart links actions'), 'view': 'document_group_view', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
groups_for_document = {'text': _(u'smart links'), 'view': 'groups_for_document', 'args': 'object.pk', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
document_groups_setup = {'text': _(u'document groups'), 'view': 'document_group_list', 'icon': 'package.png', 'permissions': [PERMISSION_DOCUMENT_GROUP_VIEW]}
document_group_list = {'text': _(u'document groups'), 'view': 'document_group_list', 'famfam': 'package', 'permissions': [PERMISSION_DOCUMENT_GROUP_VIEW]}
document_group_create = {'text': _(u'create new'), 'view': 'document_group_create', 'famfam': 'package_add', 'permissions': [PERMISSION_DOCUMENT_GROUP_CREATE]}
document_group_delete = {'text': _(u'delete'), 'view': 'document_group_delete', 'args': 'object.pk', 'famfam': 'package_delete', 'permissions': [PERMISSION_DOCUMENT_GROUP_DELETE]}
document_groups_setup = {'text': _(u'smart links'), 'view': 'document_group_list', 'icon': 'link.png', 'permissions': [PERMISSION_SMART_LINK_VIEW]}
document_group_list = {'text': _(u'smart links'), 'view': 'document_group_list', 'famfam': 'link', 'permissions': [PERMISSION_SMART_LINK_VIEW]}
document_group_create = {'text': _(u'create new'), 'view': 'document_group_create', 'famfam': 'link_add', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
document_group_delete = {'text': _(u'delete'), 'view': 'document_group_delete', 'args': 'object.pk', 'famfam': 'link_delete', 'permissions': [PERMISSION_SMART_LINK_DELETE]}
register_links(Document, [groups_for_document], menu_name='form_header')

2
apps/grouping/forms.py
View File

@@ -83,7 +83,7 @@ class DocumentGroupImageWidget(forms.widgets.Widget):
'document_name': document,
'static_url': settings.STATIC_URL,
'tags_template': tags_template if tags_template else u'',
'string': _(u'group document'),
'string': _(u'smart links'),
})
output.append(u'</div>')
output.append(

10
apps/grouping/models.py
View File

@@ -17,12 +17,12 @@ class DocumentGroup(models.Model):
return self.title
class Meta:
verbose_name = _(u'document group')
verbose_name_plural = _(u'document groups')
verbose_name = _(u'smart link')
verbose_name_plural = _(u'smart links')
class DocumentGroupItem(models.Model):
document_group = models.ForeignKey(DocumentGroup, verbose_name=_(u'document group'))
document_group = models.ForeignKey(DocumentGroup, verbose_name=_(u'smart link'))
inclusion = models.CharField(default=INCLUSION_AND, max_length=16, choices=INCLUSION_CHOICES, help_text=_(u'The inclusion is ignored for the first item.'))
foreign_document_data = models.CharField(max_length=32, verbose_name=_(u'foreign document data'), help_text=_(u'This represents the metadata of all other documents. Available objects: `document.<attribute>` and `metadata.<metadata_type_name>`.'))
operator = models.CharField(max_length=16, choices=OPERATOR_CHOICES)
@@ -36,5 +36,5 @@ class DocumentGroupItem(models.Model):
return u'[%s] %s foreign %s %s %s %s' % (u'x' if self.enabled else u' ', self.get_inclusion_display(), self.foreign_document_data, _(u'not') if self.negated else u'', self.get_operator_display(), self.expression)
class Meta:
verbose_name = _(u'group item')
verbose_name_plural = _(u'group items')
verbose_name = _(u'link condition')
verbose_name_plural = _(u'link conditions')

BIN
apps/grouping/static/images/icons/link.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
apps/grouping/static/images/icons/link_delete.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
apps/grouping/static/images/icons/package.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 972 B

BIN
apps/grouping/static/images/icons/package_delete.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

35
apps/grouping/views.py
View File

@@ -17,8 +17,8 @@ from grouping.models import DocumentGroup
from grouping.conf.settings import SHOW_EMPTY_GROUPS
from grouping.forms import DocumentDataGroupForm, DocumentGroupForm
from grouping import document_group_link
from grouping import PERMISSION_DOCUMENT_GROUP_VIEW, \
PERMISSION_DOCUMENT_GROUP_CREATE, PERMISSION_DOCUMENT_GROUP_DELETE
from grouping import PERMISSION_SMART_LINK_VIEW, \
PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE
def document_group_action(request):
@@ -38,7 +38,7 @@ def document_group_view(request, document_id, document_group_id):
return document_list(
request,
title=_(u'documents in group: %(group)s') % {
title=_(u'documents in smart link: %(group)s') % {
'group': object_list['title']
},
object_list=object_list['documents'],
@@ -54,7 +54,7 @@ def groups_for_document(request, document_id):
document_groups, errors = DocumentGroup.objects.get_groups_for(document)
if (request.user.is_staff or request.user.is_superuser) and errors:
for error in errors:
messages.warning(request, _(u'Document group query error: %s' % error))
messages.warning(request, _(u'Smart link query error: %s' % error))
if not SHOW_EMPTY_GROUPS:
#If GROUP_SHOW_EMPTY is False, remove empty groups from
@@ -65,7 +65,7 @@ def groups_for_document(request, document_id):
subtemplates_list = [{
'name': 'generic_form_subtemplate.html',
'context': {
'title': _(u'document groups (%s)') % len(document_groups.keys()),
'title': _(u'smart links (%s)') % len(document_groups.keys()),
'form': DocumentDataGroupForm(
groups=document_groups, current_document=document,
links=[document_group_link]
@@ -79,7 +79,7 @@ def groups_for_document(request, document_id):
subtemplates_list = [{
'name': 'generic_subtemplate.html',
'context': {
'content': _(u'There no defined groups for the current document.'),
'content': _(u'There no defined smart links for the current document.'),
}
}]
@@ -91,10 +91,10 @@ def groups_for_document(request, document_id):
def document_group_list(request):
check_permissions(request.user, [PERMISSION_DOCUMENT_GROUP_VIEW])
check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW])
return render_to_response('generic_list.html', {
'title': _(u'document groups'),
'title': _(u'smart links'),
'object_list': DocumentGroup.objects.all(),
'extra_columns': [
{'name': _(u'dynamic title'), 'attribute': 'dynamic_title'},
@@ -105,25 +105,25 @@ def document_group_list(request):
def document_group_create(request):
check_permissions(request.user, [PERMISSION_DOCUMENT_GROUP_CREATE])
check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE])
if request.method == 'POST':
form = DocumentGroupForm(request.POST)
if form.is_valid():
document_group = form.save()
messages.success(request, _(u'Document group: %s created successfully.') % document_group)
messages.success(request, _(u'Smart link: %s created successfully.') % document_group)
return HttpResponseRedirect(reverse('document_group_list'))
else:
form = DocumentGroupForm()
return render_to_response('generic_form.html', {
'form': form,
'title': _(u'Create new document group')
'title': _(u'Create new smart link')
}, context_instance=RequestContext(request))
def document_group_delete(request, document_group_id):
check_permissions(request.user, [PERMISSION_DOCUMENT_GROUP_DELETE])
check_permissions(request.user, [PERMISSION_SMART_LINK_DELETE])
document_group = get_object_or_404(DocumentGroup, pk=document_group_id)
@@ -133,9 +133,9 @@ def document_group_delete(request, document_group_id):
if request.method == 'POST':
try:
document_group.delete()
messages.success(request, _(u'Document group: %s deleted successfully.') % document_group)
messages.success(request, _(u'Smart link: %s deleted successfully.') % document_group)
except Exception, error:
messages.error(request, _(u'Error deleting document group: %(document_group)s; %(error)s.') % {
messages.error(request, _(u'Error deleting smart link: %(document_group)s; %(error)s.') % {
'document_group': document_group,
'error': error
})
@@ -146,10 +146,7 @@ def document_group_delete(request, document_group_id):
'object': document_group,
'next': next,
'previous': previous,
'form_icon': u'package_delete.png',
'form_icon': u'link_delete.png',
#'temporary_navigation_links': {'form_header': {'staging_file_delete': {'links': results['tab_links']}}},
}, context_instance=RequestContext(request))