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

Finished adding CRUD views for document groupping and document groupping items, started naming change to smart links and smart link conditions

Browse Source
This commit is contained in:
Roberto Rosario
2011-11-18 21:03:08 -04:00
parent 1f784aa6b0
commit 8b14cf0df5
6 changed files with 185 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/grouping/__init__.py
View File

@@ -6,29 +6,39 @@ from project_setup.api import register_setup
from documents.literals import PERMISSION_DOCUMENT_VIEW
from documents.models import Document
from grouping.models import DocumentGroup
from grouping.models import DocumentGroup, DocumentGroupItem
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')}
PERMISSION_SMART_LINK_EDIT = {'namespace': 'grouping', 'name': 'group_edit', 'label': _(u'Edit smart links')}
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)
register_permission(PERMISSION_SMART_LINK_EDIT)
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'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]}
document_groups_setup = {'text': _(u'smart links'), 'view': 'document_group_list', 'icon': 'link.png', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
document_group_list = {'text': _(u'smart links list'), 'view': 'document_group_list', 'famfam': 'link', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
document_group_create = {'text': _(u'create new smart link'), 'view': 'document_group_create', 'famfam': 'link_add', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
document_group_edit = {'text': _(u'edit'), 'view': 'document_group_edit', 'args': 'smart_link.pk', 'famfam': 'link_edit', 'permissions': [PERMISSION_SMART_LINK_EDIT]}
document_group_delete = {'text': _(u'delete'), 'view': 'document_group_delete', 'args': 'smart_link.pk', 'famfam': 'link_delete', 'permissions': [PERMISSION_SMART_LINK_DELETE]}
smart_link_condition_list = {'text': _(u'conditions'), 'view': 'smart_link_condition_list', 'args': 'smart_link.pk', 'famfam': 'cog', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_CREATE]}
smart_link_condition_create = {'text': _(u'create condition'), 'view': 'smart_link_condition_create', 'args': 'smart_link.pk', 'famfam': 'cog_add', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]}
smart_link_condition_edit = {'text': _(u'edit'), 'view': 'smart_link_condition_edit', 'args': 'condition.pk', 'famfam': 'cog_edit', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]}
smart_link_condition_delete = {'text': _(u'delete'), 'view': 'smart_link_condition_delete', 'args': 'condition.pk', 'famfam': 'cog_delete', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]}
register_links(Document, [groups_for_document], menu_name='form_header')
register_links(DocumentGroup, [document_group_delete])
register_links(['document_group_list', 'document_group_create', 'document_group_delete'], [document_group_list, document_group_create], menu_name='sidebar')
register_links(DocumentGroup, [document_group_edit, document_group_delete, smart_link_condition_list])
register_links(DocumentGroupItem, [smart_link_condition_edit, smart_link_condition_delete])
register_links(['document_group_list', 'document_group_create', 'document_group_edit', 'document_group_delete', 'smart_link_condition_list', 'smart_link_condition_create', 'smart_link_condition_edit', 'smart_link_condition_delete'], [document_group_list, document_group_create], menu_name='sidebar')
register_links(['smart_link_condition_list', 'smart_link_condition_create', 'smart_link_condition_edit', 'smart_link_condition_delete'], [smart_link_condition_create], menu_name='sidebar')
register_setup(document_groups_setup)

11
apps/grouping/forms.py
View File

@@ -8,13 +8,22 @@ from django.conf import settings
from tags.widgets import get_tags_inline_widget
from grouping.models import DocumentGroup
from grouping.models import DocumentGroup, DocumentGroupItem
class DocumentGroupForm(forms.ModelForm):
class Meta:
model = DocumentGroup
class DocumentGroupItemForm(forms.ModelForm):
class Meta:
model = DocumentGroupItem
def __init__(self, *args, **kwargs):
super(DocumentGroupItemForm, self).__init__(*args, **kwargs)
self.fields['document_group'].widget = forms.HiddenInput()
class DocumentGroupImageWidget(forms.widgets.Widget):
def render(self, name, value, attrs=None):

4
apps/grouping/models.py
View File

@@ -8,7 +8,7 @@ from grouping.literals import OPERATOR_CHOICES, INCLUSION_AND, \
class DocumentGroup(models.Model):
title = models.CharField(max_length=96, verbose_name=_(u'title'))
dynamic_title = models.CharField(blank=True, max_length=96, verbose_name=_(u'dynamic title'))
dynamic_title = models.CharField(blank=True, max_length=96, verbose_name=_(u'dynamic title'), help_text=_(u'This expression will be evaluated against the current selected document. The document metadata is available as variables `metadata` and document properties under the variable `document`.'))
enabled = models.BooleanField(default=True, verbose_name=_(u'enabled'))
objects = DocumentGroupManager()
@@ -33,7 +33,7 @@ class DocumentGroupItem(models.Model):
enabled = models.BooleanField(default=True, verbose_name=_(u'enabled'))
def __unicode__(self):
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)
return u'%s foreign %s %s %s %s' % (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'link condition')

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

6
apps/grouping/urls.py
View File

@@ -8,4 +8,10 @@ urlpatterns = patterns('grouping.views',
url(r'^setup/list/$', 'document_group_list', (), 'document_group_list'),
url(r'^setup/create/$', 'document_group_create', (), 'document_group_create'),
url(r'^setup/(?P<document_group_id>\d+)/delete/$', 'document_group_delete', (), 'document_group_delete'),
url(r'^setup/(?P<document_group_id>\d+)/edit/$', 'document_group_edit', (), 'document_group_edit'),
url(r'^setup/(?P<smart_link_pk>\d+)/condition/list/$', 'smart_link_condition_list', (), 'smart_link_condition_list'),
url(r'^setup/(?P<smart_link_pk>\d+)/condition/create/$', 'smart_link_condition_create', (), 'smart_link_condition_create'),
url(r'^setup/smart_link/condition/(?P<smart_link_condition_pk>\d+)/edit/$', 'smart_link_condition_edit', (), 'smart_link_condition_edit'),
url(r'^setup/smart_link/condition/(?P<smart_link_condition_pk>\d+)/delete/$', 'smart_link_condition_delete', (), 'smart_link_condition_delete'),
)

162
apps/grouping/views.py
View File

@@ -13,15 +13,19 @@ from documents.views import document_list
from permissions.api import check_permissions
from grouping.models import DocumentGroup
from grouping.models import DocumentGroup, DocumentGroupItem
from grouping.conf.settings import SHOW_EMPTY_GROUPS
from grouping.forms import DocumentDataGroupForm, DocumentGroupForm
from grouping.forms import (DocumentDataGroupForm, DocumentGroupForm,
DocumentGroupItemForm)
from grouping import document_group_link
from grouping import PERMISSION_SMART_LINK_VIEW, \
PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE
from grouping import (PERMISSION_SMART_LINK_VIEW,
PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
PERMISSION_SMART_LINK_EDIT)
def document_group_action(request):
check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW])
action = request.GET.get('action', None)
if not action:
@@ -32,6 +36,8 @@ def document_group_action(request):
def document_group_view(request, document_id, document_group_id):
check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW])
document = get_object_or_404(Document, pk=document_id)
document_group = get_object_or_404(DocumentGroup, pk=document_group_id)
object_list, errors = DocumentGroup.objects.get_groups_for(document, document_group)
@@ -49,6 +55,8 @@ def document_group_view(request, document_id, document_group_id):
def groups_for_document(request, document_id):
check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW])
subtemplates_list = []
document = get_object_or_404(Document, pk=document_id)
document_groups, errors = DocumentGroup.objects.get_groups_for(document)
@@ -91,7 +99,7 @@ def groups_for_document(request, document_id):
def document_group_list(request):
check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW])
check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE])
return render_to_response('generic_list.html', {
'title': _(u'smart links'),
@@ -101,6 +109,8 @@ def document_group_list(request):
{'name': _(u'enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled))},
],
'hide_link': True,
'list_object_variable_name': 'smart_link',
}, context_instance=RequestContext(request))
@@ -122,31 +132,159 @@ def document_group_create(request):
}, context_instance=RequestContext(request))
def document_group_edit(request, document_group_id):
check_permissions(request.user, [PERMISSION_SMART_LINK_EDIT])
smart_link = get_object_or_404(DocumentGroup, pk=document_group_id)
if request.method == 'POST':
form = DocumentGroupForm(request.POST, instance=smart_link)
if form.is_valid():
smart_link = form.save()
messages.success(request, _(u'Smart link: %s edited successfully.') % smart_link)
return HttpResponseRedirect(reverse('document_group_list'))
else:
form = DocumentGroupForm(instance=smart_link)
return render_to_response('generic_form.html', {
'navigation_object_name': 'smart_link',
'smart_link': smart_link,
'form': form,
'title': _(u'Edit smart link: %s') % smart_link
}, context_instance=RequestContext(request))
def document_group_delete(request, document_group_id):
check_permissions(request.user, [PERMISSION_SMART_LINK_DELETE])
document_group = get_object_or_404(DocumentGroup, pk=document_group_id)
smart_link = get_object_or_404(DocumentGroup, pk=document_group_id)
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/')))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/')))
if request.method == 'POST':
try:
document_group.delete()
messages.success(request, _(u'Smart link: %s deleted successfully.') % document_group)
smart_link.delete()
messages.success(request, _(u'Smart link: %s deleted successfully.') % smart_link)
except Exception, error:
messages.error(request, _(u'Error deleting smart link: %(document_group)s; %(error)s.') % {
'document_group': document_group,
messages.error(request, _(u'Error deleting smart link: %(smart_link)s; %(error)s.') % {
'smart_link': smart_link,
'error': error
})
return HttpResponseRedirect(next)
return render_to_response('generic_confirm.html', {
'delete_view': True,
'object': document_group,
'navigation_object_name': 'smart_link',
'smart_link': smart_link,
'title': _(u'Are you sure you wish to delete smart link: %s?') % smart_link,
'next': next,
'previous': previous,
'form_icon': u'link_delete.png',
#'temporary_navigation_links': {'form_header': {'staging_file_delete': {'links': results['tab_links']}}},
}, context_instance=RequestContext(request))
def smart_link_condition_list(request, smart_link_pk):
check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
smart_link = get_object_or_404(DocumentGroup, pk=smart_link_pk)
return render_to_response('generic_list.html', {
'title': _(u'conditions for smart link: %s') % smart_link,
'object_list': smart_link.documentgroupitem_set.all(),
'extra_columns': [
{'name': _(u'enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled))},
],
'hide_link': True,
'smart_link': smart_link,
'navigation_object_name': 'smart_link',
'list_object_variable_name': 'condition',
}, context_instance=RequestContext(request))
def smart_link_condition_create(request, smart_link_pk):
check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
smart_link = get_object_or_404(DocumentGroup, pk=smart_link_pk)
if request.method == 'POST':
form = DocumentGroupItemForm(request.POST, initial={'document_group': smart_link})
if form.is_valid():
smart_link_condition = form.save()
messages.success(request, _(u'Smart link condition: "%s" created successfully.') % smart_link_condition)
return HttpResponseRedirect(reverse('smart_link_condition_list', args=[smart_link.pk]))
else:
form = DocumentGroupItemForm(initial={'document_group': smart_link})
return render_to_response('generic_form.html', {
'form': form,
'title': _(u'Add new conditions to smart link: "%s"') % smart_link,
'navigation_object_name': 'smart_link',
'smart_link': smart_link,
}, context_instance=RequestContext(request))
def smart_link_condition_edit(request, smart_link_condition_pk):
check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
smart_link_condition = get_object_or_404(DocumentGroupItem, pk=smart_link_condition_pk)
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/')))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/')))
if request.method == 'POST':
form = DocumentGroupItemForm(request.POST, instance=smart_link_condition)
if form.is_valid():
smart_link_condition = form.save()
messages.success(request, _(u'Smart link condition: "%s" created successfully.') % smart_link_condition)
return HttpResponseRedirect(next)
else:
form = DocumentGroupItemForm(instance=smart_link_condition)
return render_to_response('generic_form.html', {
'form': form,
'title': _(u'Edit smart link condition'),
'next': next,
'previous': previous,
'condition': smart_link_condition,
'smart_link': smart_link_condition.document_group,
'navigation_object_list': [
{'object': 'smart_link', 'name': _(u'smart link')},
{'object': 'condition', 'name': _(u'condition')}
],
}, context_instance=RequestContext(request))
def smart_link_condition_delete(request, smart_link_condition_pk):
check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT])
smart_link_condition = get_object_or_404(DocumentGroupItem, pk=smart_link_condition_pk)
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/')))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/')))
if request.method == 'POST':
try:
smart_link_condition.delete()
messages.success(request, _(u'Smart link condition: "%s" deleted successfully.') % smart_link_condition)
except Exception, error:
messages.error(request, _(u'Error deleting smart link condition: %(smart_link_condition)s; %(error)s.') % {
'smart_link_condition': smart_link_condition,
'error': error
})
return HttpResponseRedirect(next)
return render_to_response('generic_confirm.html', {
'delete_view': True,
'condition': smart_link_condition,
'smart_link': smart_link_condition.document_group,
'navigation_object_list': [
{'object': 'smart_link', 'name': _(u'smart link')},
{'object': 'condition', 'name': _(u'condition')}
],
'title': _(u'Are you sure you wish to delete smart link condition: "%s"?') % smart_link_condition,
'next': next,
'previous': previous,
'form_icon': u'cog_delete.png',
}, context_instance=RequestContext(request))