From 9f4112187e6b5bc0cbb3238f42e0e5bb9be0a54e Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 18 Nov 2011 23:08:01 -0400 Subject: [PATCH] Further document grouping rename --- apps/grouping/__init__.py | 6 ++--- apps/grouping/forms.py | 15 ++++++----- apps/grouping/urls.py | 10 ++++---- apps/grouping/views.py | 54 +++++++++++++++++++-------------------- 4 files changed, 43 insertions(+), 42 deletions(-) diff --git a/apps/grouping/__init__.py b/apps/grouping/__init__.py index 870daeecf0..18b0ce37f4 100644 --- a/apps/grouping/__init__.py +++ b/apps/grouping/__init__.py @@ -20,8 +20,8 @@ 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]} +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]} @@ -34,7 +34,7 @@ smart_link_condition_create = {'text': _(u'create condition'), 'view': 'smart_li 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(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]) diff --git a/apps/grouping/forms.py b/apps/grouping/forms.py index 7dd9c69242..0aa5df627e 100644 --- a/apps/grouping/forms.py +++ b/apps/grouping/forms.py @@ -11,12 +11,12 @@ from tags.widgets import get_tags_inline_widget from grouping.models import DocumentGroup, DocumentGroupItem -class DocumentGroupForm(forms.ModelForm): +class SmartLinkForm(forms.ModelForm): class Meta: model = DocumentGroup -class DocumentGroupItemForm(forms.ModelForm): +class SmartLinkConditionForm(forms.ModelForm): class Meta: model = DocumentGroupItem @@ -25,9 +25,10 @@ class DocumentGroupItemForm(forms.ModelForm): self.fields['document_group'].widget = forms.HiddenInput() -class DocumentGroupImageWidget(forms.widgets.Widget): +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']: @@ -38,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'
') @@ -102,15 +103,15 @@ 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) links = kwargs.pop('links', None) current_document = kwargs.pop('current_document', None) - super(DocumentDataGroupForm, self).__init__(*args, **kwargs) + super(SmartLinkInstanceForm, self).__init__(*args, **kwargs) for group, data in groups.items(): self.fields['preview-%s' % group] = forms.CharField( - widget=DocumentGroupImageWidget(), + widget=SmartLinkImageWidget(), label=u'%s (%d)' % (unicode(data['title']), len(data['documents'])), required=False, initial={ diff --git a/apps/grouping/urls.py b/apps/grouping/urls.py index 5bb89e3da6..74a852a69a 100644 --- a/apps/grouping/urls.py +++ b/apps/grouping/urls.py @@ -1,14 +1,14 @@ 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+)/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'), diff --git a/apps/grouping/views.py b/apps/grouping/views.py index c9483b0e0c..348538d38a 100644 --- a/apps/grouping/views.py +++ b/apps/grouping/views.py @@ -15,15 +15,15 @@ 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, DocumentGroupForm, - DocumentGroupItemForm) -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) @@ -35,12 +35,12 @@ 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, @@ -54,12 +54,12 @@ 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_links, 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'Smart link query error: %s' % error)) @@ -69,16 +69,16 @@ def groups_for_document(request, document_id): #dictionary document_groups = dict([(group, data) for group, data in document_groups.items() if data['documents']]) - if document_groups: + if smart_links: subtemplates_list = [{ 'name': 'generic_form_subtemplate.html', 'context': { - 'title': _(u'smart links (%s)') % len(document_groups.keys()), - 'form': DocumentDataGroupForm( - groups=document_groups, current_document=document, - links=[document_group_link] + 'title': _(u'smart links (%s)') % len(smart_links.keys()), + 'form': SmartLinkInstanceForm( + groups=smart_links, current_document=document, + links=[smart_link_instance_view_link] ), - 'form_action': reverse('document_group_action'), + 'form_action': reverse('smart_link_action'), 'submit_method': 'GET', } }] @@ -118,13 +118,13 @@ def document_group_create(request): check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE]) if request.method == 'POST': - form = DocumentGroupForm(request.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 = DocumentGroupForm() + form = SmartLinkForm() return render_to_response('generic_form.html', { 'form': form, @@ -132,19 +132,19 @@ def document_group_create(request): }, context_instance=RequestContext(request)) -def document_group_edit(request, document_group_id): +def document_group_edit(request, smart_link_pk): check_permissions(request.user, [PERMISSION_SMART_LINK_EDIT]) - smart_link = get_object_or_404(DocumentGroup, pk=document_group_id) + smart_link = get_object_or_404(DocumentGroup, pk=smart_link_pk) if request.method == 'POST': - form = DocumentGroupForm(request.POST, instance=smart_link) + 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 = DocumentGroupForm(instance=smart_link) + form = SmartLinkForm(instance=smart_link) return render_to_response('generic_form.html', { 'navigation_object_name': 'smart_link', @@ -154,10 +154,10 @@ def document_group_edit(request, document_group_id): }, context_instance=RequestContext(request)) -def document_group_delete(request, document_group_id): +def document_group_delete(request, smart_link_pk): check_permissions(request.user, [PERMISSION_SMART_LINK_DELETE]) - smart_link = get_object_or_404(DocumentGroup, pk=document_group_id) + 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', '/'))) @@ -208,13 +208,13 @@ def smart_link_condition_create(request, smart_link_pk): smart_link = get_object_or_404(DocumentGroup, pk=smart_link_pk) if request.method == 'POST': - form = DocumentGroupItemForm(request.POST, initial={'document_group': smart_link}) + 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 = DocumentGroupItemForm(initial={'document_group': smart_link}) + form = SmartLinkConditionForm(initial={'document_group': smart_link}) return render_to_response('generic_form.html', { 'form': form, @@ -233,13 +233,13 @@ def smart_link_condition_edit(request, smart_link_condition_pk): 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) + 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 = DocumentGroupItemForm(instance=smart_link_condition) + form = SmartLinkConditionForm(instance=smart_link_condition) return render_to_response('generic_form.html', { 'form': form,