diff --git a/apps/grouping/__init__.py b/apps/grouping/__init__.py index b939fc5fa6..fc014bce6f 100644 --- a/apps/grouping/__init__.py +++ b/apps/grouping/__init__.py @@ -1,11 +1,44 @@ from django.utils.translation import ugettext_lazy as _ -from navigation.api import register_links - +from navigation.api import register_links, register_sidebar_template +from permissions.api import register_permission, set_namespace_title +from project_setup.api import register_setup from documents.literals import PERMISSION_DOCUMENT_VIEW from documents.models import Document -document_group_link = {'text': _(u'group actions'), 'view': 'document_group_view', 'famfam': 'page_go', 'permissions': [PERMISSION_DOCUMENT_VIEW]} -groups_for_document = {'text': _(u'groups'), 'view': 'groups_for_document', 'args': 'object.pk', 'famfam': 'page_go', 'permissions': [PERMISSION_DOCUMENT_VIEW]} +from grouping.models import DocumentGroup, DocumentGroupItem -register_links(Document, [groups_for_document], menu_name='form_header') +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) + +smart_link_instance_view_link = {'text': _(u'smart links actions'), 'view': 'smart_link_instance_view', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]} +smart_link_instances_for_document = {'text': _(u'smart links'), 'view': 'smart_link_instances_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_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, [smart_link_instances_for_document], menu_name='form_header') + +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) +register_sidebar_template(['document_group_list'], 'smart_links_help.html') diff --git a/apps/grouping/forms.py b/apps/grouping/forms.py index 389987ab7a..506b20ee6d 100644 --- a/apps/grouping/forms.py +++ b/apps/grouping/forms.py @@ -8,10 +8,27 @@ from django.conf import settings from tags.widgets import get_tags_inline_widget +from grouping.models import DocumentGroup, DocumentGroupItem -class DocumentGroupImageWidget(forms.widgets.Widget): + +class SmartLinkForm(forms.ModelForm): + class Meta: + model = DocumentGroup + + +class SmartLinkConditionForm(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 SmartLinkImageWidget(forms.widgets.Widget): def render(self, name, value, attrs=None): output = [] + # TODO: convert to navigation app if value['links']: output.append(u'
') for link in value['links']: @@ -22,7 +39,7 @@ class DocumentGroupImageWidget(forms.widgets.Widget): ''' % { 'famfam': link.get('famfam', u'link'), 'text': capfirst(link['text']), - 'action': reverse('document_group_view', args=[value['current_document'].pk, value['group'].pk]) + 'action': reverse(link.get('view'), args=[value['current_document'].pk, value['group'].pk]) }) output.append(u'
') @@ -76,7 +93,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'') output.append( @@ -86,19 +103,19 @@ class DocumentGroupImageWidget(forms.widgets.Widget): return mark_safe(u''.join(output)) -class DocumentDataGroupForm(forms.Form): +class SmartLinkInstanceForm(forms.Form): def __init__(self, *args, **kwargs): - groups = kwargs.pop('groups', None) + smart_link_instances = kwargs.pop('smart_link_instances', None) links = kwargs.pop('links', None) current_document = kwargs.pop('current_document', None) - super(DocumentDataGroupForm, self).__init__(*args, **kwargs) - for group, data in groups.items(): - self.fields['preview-%s' % group] = forms.CharField( - widget=DocumentGroupImageWidget(), + super(SmartLinkInstanceForm, self).__init__(*args, **kwargs) + for smart_link_instance, data in smart_link_instances.items(): + self.fields['preview-%s' % smart_link_instance] = forms.CharField( + widget=SmartLinkImageWidget(), label=u'%s (%d)' % (unicode(data['title']), len(data['documents'])), required=False, initial={ - 'group': group, + 'group': smart_link_instance, 'group_data': data['documents'], 'current_document': current_document, 'links': links diff --git a/apps/grouping/managers.py b/apps/grouping/managers.py index 4ed9a174d4..b8f3204ecf 100644 --- a/apps/grouping/managers.py +++ b/apps/grouping/managers.py @@ -7,7 +7,7 @@ from documents.models import Document from grouping.literals import INCLUSION_AND, INCLUSION_OR -class DocumentGroupManager(models.Manager): +class SmartLinkManager(models.Manager): def get_groups_for(self, document, group_obj=None): errors = [] document_groups = {} diff --git a/apps/grouping/models.py b/apps/grouping/models.py index fc8bb76ed5..ab032cec19 100644 --- a/apps/grouping/models.py +++ b/apps/grouping/models.py @@ -1,28 +1,28 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ -from grouping.managers import DocumentGroupManager +from grouping.managers import SmartLinkManager from grouping.literals import OPERATOR_CHOICES, INCLUSION_AND, \ INCLUSION_CHOICES 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() + objects = SmartLinkManager() def __unicode__(self): 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.` and `metadata.`.')) operator = models.CharField(max_length=16, choices=OPERATOR_CHOICES) @@ -33,8 +33,8 @@ 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'group item') - verbose_name_plural = _(u'group items') + verbose_name = _(u'link condition') + verbose_name_plural = _(u'link conditions') diff --git a/apps/grouping/static/images/icons/cog_delete.png b/apps/grouping/static/images/icons/cog_delete.png new file mode 100644 index 0000000000..924e04d69c Binary files /dev/null and b/apps/grouping/static/images/icons/cog_delete.png differ diff --git a/apps/grouping/static/images/icons/link.png b/apps/grouping/static/images/icons/link.png new file mode 100644 index 0000000000..b0c35b59a3 Binary files /dev/null and b/apps/grouping/static/images/icons/link.png differ diff --git a/apps/grouping/static/images/icons/link_delete.png b/apps/grouping/static/images/icons/link_delete.png new file mode 100644 index 0000000000..b584c29f39 Binary files /dev/null and b/apps/grouping/static/images/icons/link_delete.png differ diff --git a/apps/grouping/templates/smart_links_help.html b/apps/grouping/templates/smart_links_help.html new file mode 100644 index 0000000000..8a23361a9b --- /dev/null +++ b/apps/grouping/templates/smart_links_help.html @@ -0,0 +1,5 @@ +{% load i18n %} +
+

{% trans "What are smart links?" %}

+

{% blocktrans %}Smart links are a set of conditional statements that are used to query the database using the current document the user is accessing as the data source, the results of these queries are a list of documents that relate in some manner to the document being displayed and allow users the ability to jump to and from linked documents very easily.{% endblocktrans %}

+
diff --git a/apps/grouping/urls.py b/apps/grouping/urls.py index ecb15abd27..74a852a69a 100644 --- a/apps/grouping/urls.py +++ b/apps/grouping/urls.py @@ -1,7 +1,17 @@ from django.conf.urls.defaults import patterns, url urlpatterns = patterns('grouping.views', - url(r'^action/$', 'document_group_action', (), 'document_group_action'), - url(r'^document/(?P\d+)/group/(?P\d+)/$', 'document_group_view', (), 'document_group_view'), - url(r'^groups/for_document/(?P\d+)/$', 'groups_for_document', (), 'groups_for_document'), + url(r'^action/$', 'smart_link_action', (), 'smart_link_action'), + url(r'^document/(?P\d+)/smart_link/(?P\d+)/$', 'smart_link_instance_view', (), 'smart_link_instance_view'), + url(r'^smart/for_document/(?P\d+)/$', 'smart_link_instances_for_document', (), 'smart_link_instances_for_document'), + + url(r'^setup/list/$', 'document_group_list', (), 'document_group_list'), + url(r'^setup/create/$', 'document_group_create', (), 'document_group_create'), + url(r'^setup/(?P\d+)/delete/$', 'document_group_delete', (), 'document_group_delete'), + url(r'^setup/(?P\d+)/edit/$', 'document_group_edit', (), 'document_group_edit'), + + url(r'^setup/(?P\d+)/condition/list/$', 'smart_link_condition_list', (), 'smart_link_condition_list'), + url(r'^setup/(?P\d+)/condition/create/$', 'smart_link_condition_create', (), 'smart_link_condition_create'), + url(r'^setup/smart_link/condition/(?P\d+)/edit/$', 'smart_link_condition_edit', (), 'smart_link_condition_edit'), + url(r'^setup/smart_link/condition/(?P\d+)/delete/$', 'smart_link_condition_delete', (), 'smart_link_condition_delete'), ) diff --git a/apps/grouping/views.py b/apps/grouping/views.py index 704483ce45..e6085b9d4f 100644 --- a/apps/grouping/views.py +++ b/apps/grouping/views.py @@ -5,16 +5,27 @@ from django.shortcuts import get_object_or_404, render_to_response from django.core.urlresolvers import reverse from django.template import RequestContext +from common.utils import generate_choices_w_labels, encapsulate +from common.widgets import two_state_template + from documents.models import Document from documents.views import document_list -from grouping.models import DocumentGroup +from permissions.api import check_permissions + +from grouping.models import DocumentGroup, DocumentGroupItem from grouping.conf.settings import SHOW_EMPTY_GROUPS -from grouping.forms import DocumentDataGroupForm -from grouping import document_group_link +from grouping.forms import (SmartLinkInstanceForm, SmartLinkForm, + SmartLinkConditionForm) +from grouping import smart_link_instance_view_link +from grouping import (PERMISSION_SMART_LINK_VIEW, + PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE, + PERMISSION_SMART_LINK_EDIT) -def document_group_action(request): +def smart_link_action(request): + check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW]) + action = request.GET.get('action', None) if not action: @@ -24,14 +35,16 @@ def document_group_action(request): return HttpResponseRedirect(action) -def document_group_view(request, document_id, document_group_id): +def smart_link_instance_view(request, document_id, smart_link_pk): + 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) + smart_link = get_object_or_404(DocumentGroup, pk=smart_link_pk) + object_list, errors = DocumentGroup.objects.get_groups_for(document, smart_link) 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'], @@ -41,29 +54,31 @@ def document_group_view(request, document_id, document_group_id): ) -def groups_for_document(request, document_id): +def smart_link_instances_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) + smart_link_instances, 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 #dictionary - document_groups = dict([(group, data) for group, data in document_groups.items() if data['documents']]) + smart_link_instances = dict([(group, data) for group, data in smart_link_instances.items() if data['documents']]) - if document_groups: + if smart_link_instances: subtemplates_list = [{ 'name': 'generic_form_subtemplate.html', 'context': { - 'title': _(u'document groups (%s)') % len(document_groups.keys()), - 'form': DocumentDataGroupForm( - groups=document_groups, current_document=document, - links=[document_group_link] + 'title': _(u'smart links (%s)') % len(smart_link_instances.keys()), + 'form': SmartLinkInstanceForm( + smart_link_instances=smart_link_instances, current_document=document, + links=[smart_link_instance_view_link] ), - 'form_action': reverse('document_group_action'), + 'form_action': reverse('smart_link_action'), 'submit_method': 'GET', } }] @@ -72,7 +87,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.'), } }] @@ -80,4 +95,196 @@ def groups_for_document(request, document_id): 'object': document, 'document': document, 'subtemplates_list': subtemplates_list, - }, context_instance=RequestContext(request)) + }, context_instance=RequestContext(request)) + + +def document_group_list(request): + check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE]) + + return render_to_response('generic_list.html', { + 'title': _(u'smart links'), + 'object_list': DocumentGroup.objects.all(), + 'extra_columns': [ + {'name': _(u'dynamic title'), 'attribute': 'dynamic_title'}, + {'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)) + + +def document_group_create(request): + check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE]) + + if request.method == 'POST': + form = SmartLinkForm(request.POST) + if form.is_valid(): + document_group = form.save() + messages.success(request, _(u'Smart link: %s created successfully.') % document_group) + return HttpResponseRedirect(reverse('document_group_list')) + else: + form = SmartLinkForm() + + return render_to_response('generic_form.html', { + 'form': form, + 'title': _(u'Create new smart link') + }, context_instance=RequestContext(request)) + + +def document_group_edit(request, smart_link_pk): + check_permissions(request.user, [PERMISSION_SMART_LINK_EDIT]) + + smart_link = get_object_or_404(DocumentGroup, pk=smart_link_pk) + + if request.method == 'POST': + form = SmartLinkForm(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 = SmartLinkForm(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, smart_link_pk): + check_permissions(request.user, [PERMISSION_SMART_LINK_DELETE]) + + smart_link = get_object_or_404(DocumentGroup, pk=smart_link_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.delete() + messages.success(request, _(u'Smart link: %s deleted successfully.') % smart_link) + except Exception, error: + 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, + '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', + }, 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 = SmartLinkConditionForm(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 = SmartLinkConditionForm(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 = SmartLinkConditionForm(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 = SmartLinkConditionForm(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)) diff --git a/apps/permissions/views.py b/apps/permissions/views.py index 65bd30ec56..3f58846eb9 100644 --- a/apps/permissions/views.py +++ b/apps/permissions/views.py @@ -102,8 +102,8 @@ def role_create(request): def role_delete(request, role_id): check_permissions(request.user, [PERMISSION_ROLE_DELETE]) - next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None))) - previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None))) + 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', '/'))) return delete_object(request, model=Role, object_id=role_id, template_name='generic_confirm.html', @@ -122,8 +122,8 @@ def permission_grant(request): items_property_list = loads(request.GET.get('items_property_list', [])) post_action_redirect = None - next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None))) - previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None))) + 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', '/'))) items = [] for item_properties in items_property_list: diff --git a/apps/project_setup/__init__.py b/apps/project_setup/__init__.py index 93a570a912..7f160810a2 100644 --- a/apps/project_setup/__init__.py +++ b/apps/project_setup/__init__.py @@ -3,4 +3,4 @@ from django.utils.translation import ugettext_lazy as _ from navigation.api import register_top_menu #TODO: FIXME dynamic children_path_regext on api register_setup -register_top_menu('setup_menu', link={'text': _(u'setup'), 'view': 'setup_list', 'famfam': 'cog'}, children_path_regex=[r'^settings/', r'^user_management/', r'^permissions', r'^documents/type', r'^metadata/setup', r'sources/setup'], position=-2) +register_top_menu('setup_menu', link={'text': _(u'setup'), 'view': 'setup_list', 'famfam': 'cog'}, children_path_regex=[r'^settings/', r'^user_management/', r'^permissions', r'^documents/type', r'^metadata/setup', r'sources/setup', r'grouping/setup'], position=-2)