From fa4a13668b3796185fcd6a3b3da6c2d28818a550 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 17 Nov 2011 23:21:56 -0400 Subject: [PATCH 1/8] Added views to create, list and delete document groups via the project setup --- apps/grouping/__init__.py | 29 ++++++- apps/grouping/forms.py | 7 ++ apps/grouping/static/images/icons/package.png | Bin 0 -> 972 bytes .../static/images/icons/package_delete.png | Bin 0 -> 1538 bytes apps/grouping/urls.py | 4 + apps/grouping/views.py | 76 +++++++++++++++++- 6 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 apps/grouping/static/images/icons/package.png create mode 100644 apps/grouping/static/images/icons/package_delete.png diff --git a/apps/grouping/__init__.py b/apps/grouping/__init__.py index b939fc5fa6..4bfe65aea0 100644 --- a/apps/grouping/__init__.py +++ b/apps/grouping/__init__.py @@ -1,11 +1,34 @@ from django.utils.translation import ugettext_lazy as _ from navigation.api import register_links - +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 + + +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')} + +set_namespace_title('grouping', _(u'Grouping')) +register_permission(PERMISSION_DOCUMENT_GROUP_VIEW) +register_permission(PERMISSION_DOCUMENT_GROUP_CREATE) +register_permission(PERMISSION_DOCUMENT_GROUP_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_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]} 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_setup(document_groups_setup) diff --git a/apps/grouping/forms.py b/apps/grouping/forms.py index 389987ab7a..3c5d65792b 100644 --- a/apps/grouping/forms.py +++ b/apps/grouping/forms.py @@ -8,6 +8,13 @@ from django.conf import settings from tags.widgets import get_tags_inline_widget +from grouping.models import DocumentGroup + + +class DocumentGroupForm(forms.ModelForm): + class Meta: + model = DocumentGroup + class DocumentGroupImageWidget(forms.widgets.Widget): def render(self, name, value, attrs=None): diff --git a/apps/grouping/static/images/icons/package.png b/apps/grouping/static/images/icons/package.png new file mode 100644 index 0000000000000000000000000000000000000000..448681eaf5aaf6361059da71e97f791a878a6591 GIT binary patch literal 972 zcmV;-12g=IP)AR(c6?{HTP#idWZ@v2OqcDHd4BW0&pR{AIOo{TOTji@I{@q_ecJT+k;jJ0M!+0S z$1WW8TgynS{s(hM8fleZD?(9pi;AQs+F%ytDiN$OMU7dc!qXzw^2GnZc$>W%tdWgZxuUa5ji}@2S)pzI-W=d1~+nboo!EVuhX*ba#i5Ookvzn{?$}qyfAN)^`yfpI*n{mDwf; z)+~O=I(Xp$Y9DS23()LU6xYhgWeX^*SSXds2!{OVhz5~JgyAkBGVF^5Eagm?YbE&o z2Ex01h{nPQgba#;EiItzzlyi_&Jo0$280V>%#06O{gGag=}^e>4h9kz(O#nBN`8*z1@e%@%xy)GmL>zCmjMn ze|=|Yp~`&m#Z(TlWE9cP2$H>Vgd%N@^&9Pncr`hZHOJC5MZK-%SCN{}AeYV~OBxB% zuq&nKN3Xm*MR5ittr{N~xkix^CC2J{9Hv`#f4N#a8DFBq3)N;e3HIh|XAspRd@)CgQQp;VhwML(9LeVMzit&pr z;-3g;O>ndt8;+X-R-x5Rtw+F10LGJGer9c=^^%j6DQmY9- z6oeu?AWSIFC>{dP_(F?s^Z-zVN-5wTACj1GAvQ!nY#>yeQ~+WRXWjxZF0~lj2%y)Nms*F1?%Q|?Bjl-llIH=rCDX3B ug{N^|KM|SR{aQc^e%z_F|){C0W0IIcuSr5G452^j4}O5RUoSf1wOdgME{D_05Es$S&?sidA05Es%4&+-_ZvqRRp&$vg zseo{_fIFi(_&gT)=UXR%U{Z0A#zT=j8fe_>Hq#shP!y>CmoaeuFajTSP6NTFDc{wW zU%YWA)PZklR04NDcPZh}?!jOhBO~KP9tBpLNn4c57U`dW1q+<;`yE=SNN+i09E4f| zYk3FPe*7GPt(OfTm{IxCeCylaLHYYDP64uBL^fSOG%}9yWFEO(0d|KK^W1j$d`?sj zkmmN#IL4wGWYRfUt!6lDEpU6BusO`+1({}*AS~H|tB2ks5LYHZQ~;Q}_XP57AD&0- z>?XwHc|^nG$YhGNfd%s$-SBv7V6$5^tI7gH3>YhWh)Xt;MXT zzTN`Yy2H4Hd-=eyu<^1|V&K{?nJnc^=46PeMM z6;kMuj-?R19Y%CCh6w5Kkq)_-`)TFYORtijVY7&G`;!|#CQp%Nw7RTMMMhUL(_B?P zjl`b@pvlkhh=x<8$TIXC-`UP}a{v}qmLWC0i15+XfM}VFj5^!dhBlP*@VS?WN>&J>1K@My3(X30x}5dhQ-y{sO9X1PT`-@!hl2So(7 zZ$s%u57I{tpcD?4m3aNAf9833wts>v`}g6-{v!~4q7i^9XDI}nfa1dgU>vW2~IIMb%r?ODe#`v6t8`fj+k7IX*fQTVd2-GT?Bo06{O9*$2 zV$qs;$X)0Iqok%53ioUnm?%OX=!2_mC9V&ZCIM(2j9MTT^BP`V{Iy(0gc5Jv1aT2{ zr!U`kO=81xu-iAGO*R0KWH76vI{xbb1hPy`j1h;d4_?CO#K$Ib4F{k`Q}XZKCr++X zs;oL%`Lzke9S$H4v9=DWH(sEGQ^K?g#^*|sHb;ra4S689_Os4+>F$}Dn5wv>qiu`7 zjA!xzkBc_9SoKcm9?6P#R&+Wd@dT13xeFRKwX}pGl2G+2P`hluj>W%jzGFY+^LezB zr0}9M-2oJ_vfKX+hH)+w-^&{ke&`jwJ<5=zXCT?GL@K(*Q`=HZrxrCfG-x0=FBr9S z{4R3W(>vbWcK&q@{qfYP9le9!(AqI^7K$u4KshlI?OIh=)0|7jAG294a5$ZmBP>KZ zljizpEQX%Geq4(tPruc9{Zm?Vhl6LcROz`PbtH|Ontji$_q*P6OJeKPwmn*subv9V z4jdi|U7)|i{6z9HF\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'^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'), ) diff --git a/apps/grouping/views.py b/apps/grouping/views.py index 704483ce45..a47099eb0d 100644 --- a/apps/grouping/views.py +++ b/apps/grouping/views.py @@ -5,13 +5,20 @@ 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 permissions.api import check_permissions + from grouping.models import DocumentGroup from grouping.conf.settings import SHOW_EMPTY_GROUPS -from grouping.forms import DocumentDataGroupForm +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 def document_group_action(request): @@ -80,4 +87,69 @@ 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_DOCUMENT_GROUP_VIEW]) + + return render_to_response('generic_list.html', { + 'title': _(u'document groups'), + '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, + }, context_instance=RequestContext(request)) + + +def document_group_create(request): + check_permissions(request.user, [PERMISSION_DOCUMENT_GROUP_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) + return HttpResponseRedirect(reverse('document_group_list')) + else: + form = DocumentGroupForm() + + return render_to_response('generic_form.html', { + 'form': form, + 'title': _(u'Create new document group') + }, context_instance=RequestContext(request)) + + +def document_group_delete(request, document_group_id): + check_permissions(request.user, [PERMISSION_DOCUMENT_GROUP_DELETE]) + + document_group = 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'Document group: %s deleted successfully.') % document_group) + except Exception, error: + messages.error(request, _(u'Error deleting document group: %(document_group)s; %(error)s.') % { + 'document_group': document_group, + 'error': error + }) + return HttpResponseRedirect(next) + + return render_to_response('generic_confirm.html', { + 'delete_view': True, + 'object': document_group, + 'next': next, + 'previous': previous, + 'form_icon': u'package_delete.png', + #'temporary_navigation_links': {'form_header': {'staging_file_delete': {'links': results['tab_links']}}}, + }, context_instance=RequestContext(request)) + + + + From 3934b4c53579552806ca28ab62a4dc1d55a61fd3 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 17 Nov 2011 23:22:33 -0400 Subject: [PATCH 2/8] Add the document grouping setup url to the project setup menu link child urls list --- apps/project_setup/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 96e92b296e0fa6f8929f698960adbbbbb8f6f35b Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 17 Nov 2011 23:23:18 -0400 Subject: [PATCH 3/8] Improved POST redirect default url from None to '/' --- apps/permissions/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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: From 1f784aa6b0860aa39671d0faa64bb5510e57d09b Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 18 Nov 2011 18:29:59 -0400 Subject: [PATCH 4/8] Started the rename of the document grouping app to smart linking --- apps/grouping/__init__.py | 26 ++++++------- apps/grouping/forms.py | 2 +- apps/grouping/models.py | 10 ++--- apps/grouping/static/images/icons/link.png | Bin 0 -> 1282 bytes .../static/images/icons/link_delete.png | Bin 0 -> 1921 bytes apps/grouping/static/images/icons/package.png | Bin 972 -> 0 bytes .../static/images/icons/package_delete.png | Bin 1538 -> 0 bytes apps/grouping/views.py | 35 ++++++++---------- 8 files changed, 35 insertions(+), 38 deletions(-) create mode 100644 apps/grouping/static/images/icons/link.png create mode 100644 apps/grouping/static/images/icons/link_delete.png delete mode 100644 apps/grouping/static/images/icons/package.png delete mode 100644 apps/grouping/static/images/icons/package_delete.png diff --git a/apps/grouping/__init__.py b/apps/grouping/__init__.py index 4bfe65aea0..a30c52586d 100644 --- a/apps/grouping/__init__.py +++ b/apps/grouping/__init__.py @@ -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') diff --git a/apps/grouping/forms.py b/apps/grouping/forms.py index 3c5d65792b..bd28945eda 100644 --- a/apps/grouping/forms.py +++ b/apps/grouping/forms.py @@ -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'') output.append( diff --git a/apps/grouping/models.py b/apps/grouping/models.py index fc8bb76ed5..05841b2a85 100644 --- a/apps/grouping/models.py +++ b/apps/grouping/models.py @@ -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.` and `metadata.`.')) 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') diff --git a/apps/grouping/static/images/icons/link.png b/apps/grouping/static/images/icons/link.png new file mode 100644 index 0000000000000000000000000000000000000000..b0c35b59a32a35922e235ce13cfaea86fb337aa3 GIT binary patch literal 1282 zcmV+d1^xPoP)20c}Tt0!?8C z=xDn*fBM6aEEdGD1Q?8M&Y9_)i5akqKa4SPh|I~&Y>66U;$^0z!)-+4-0+8)a_I%U zEl{ADC53V5Mi*U6ZE3c)r#Ij4^t1vi!Z=-alJ}&^cTS)8d%x#>pXcx*kqA7@D}~&6 zJYKT@m)F|XS&}XiT?~c8d7)qsBB3zQ0s3OgyG?s>Js5wGR3OO-@Y_329w;g(R99>( z2cOpuF1H)(4hKw6O~ahc25s*je-xjiA4CHD*7gq$$cl>8H8s^>7#;>{#tH%24?=+u zBvL8ZY&U?Sti2z9cxpGPL`pJuz8GAqGl1D_2Ghj&r{+JenN(%vZ}@266FE6KnAB`7 zJ}(Q+YtOLuHVAAbFlu>?>CD>Xxb$L#{SQhBQJ&=DPBID+pZ;MLWYpw%0&4X0q{ z`gF%1zyGGk^}ESPAT<;U!MyVyu>XA< z_x1fmj>aCF1Dr`1!U?C>YN4>G0Cv{Z!slO}2A|IdTedvevmCrX3Vw^-eIywi0GG?@ zk|^X^yXtm;`b-yGy*dJ~A3X|$aQ%bYMBsNY!pRuLsc#>9XLj>ujF8&{$uO ztrlk3&RI$mtJ;5(+H>LDIb6T_)#)#`&CT6x%Fo{j8Ch9iw>wA$=96Md?@={$GOU^C zW_vie|CLv_%jJp=GG6-!w5V#-5>?}x0HbPNpP$$zKnwNJBJh}`eionYQh%=AnbHH2hq1bORO`x*Qe6b9y2~yrUDVF8gVkKsoJ_d9XpCe_*>rGa>6K)xosNU38rrDURE=u_q!PIp#RnS>pWGl6ZY7)`u~t>%ngG*^7}*$k7@6$xtXb8P skwAemnR1J#a!przMkS>B{!K=f2;$=brQXoyTGE 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 Date: Fri, 18 Nov 2011 21:03:08 -0400 Subject: [PATCH 5/8] Finished adding CRUD views for document groupping and document groupping items, started naming change to smart links and smart link conditions --- apps/grouping/__init__.py | 24 ++- apps/grouping/forms.py | 11 +- apps/grouping/models.py | 4 +- .../static/images/icons/cog_delete.png | Bin 0 -> 2273 bytes apps/grouping/urls.py | 6 + apps/grouping/views.py | 162 ++++++++++++++++-- 6 files changed, 185 insertions(+), 22 deletions(-) create mode 100644 apps/grouping/static/images/icons/cog_delete.png diff --git a/apps/grouping/__init__.py b/apps/grouping/__init__.py index a30c52586d..870daeecf0 100644 --- a/apps/grouping/__init__.py +++ b/apps/grouping/__init__.py @@ -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) diff --git a/apps/grouping/forms.py b/apps/grouping/forms.py index bd28945eda..7dd9c69242 100644 --- a/apps/grouping/forms.py +++ b/apps/grouping/forms.py @@ -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): diff --git a/apps/grouping/models.py b/apps/grouping/models.py index 05841b2a85..bd8e3d1348 100644 --- a/apps/grouping/models.py +++ b/apps/grouping/models.py @@ -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') 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 0000000000000000000000000000000000000000..924e04d69ca011457c71bc0a76f992fbc0f1fda3 GIT binary patch literal 2273 zcmV<72p;!|P)scq%-Os9z0T|R{my}d|Njw>9DVaF0B4dU zDKNnAl47rS7Cx>1CvY4OvMj+9rXS52q*V-1RUA1siczY6sqBR<-xn2r zfidA=`RgCAT$%nvT3V{U{Ix&+7soVZFTT9Z?ePFcfrXtsr#Jnkahj)fw4V0SemaNF zyPE;?Cxrv$ul_A7BV$WZQ6a>~$AiHT6_J>?~N8k_>j6Eh9TOH>dW(`7;ERg$&?=!+x;*wW_SFtj$G* z>)}d6BRHKdShFS{Wb{(PaFgQE(NU({@4dt%CME`!E=>d;)57r_G&VLvNQf5J{$LGU ztgDCi_V$15+w<~M3#B6%10g&wtdnIKW-+9soDOepz6w!Mk*Ii#<((9B90#EH z%*qUli7~>b8C`{^87N9TSQNP|R~XsPoTK(W&mAox$fc@|5_BE@XNfsRSfYi zmnV>K%rnEqvSrDTxFi8$?$$;E`N1iK|)g2(NKn7BnfO^pq;boO_FP<&H6x;1FED-a1@y_|>OzXjI9k zrsng{E|jBV%KXT&8BG@n$4|d3Om*4H6ynpek!I(S}f3YLKF*l0Q*j%<9X(VTBU~6wDkA|$iy2F5uv4dALd`g zv{AkV%DeKNN5>@8D=$EX;v5!LxR`(@Nj{jJ^&#u^1qjDxpMlJ*Oz7(F{u3^)nrDO< zzj#Rn&D)#~;58cH@M=nEcv2#mUX$^o?oM zA8r#KxdN5APacEhb%h|bH-c~A7I2sv4nfW4sXpNKQu43>lGanR)#fTPorc6wm! zbZ|!$;&eJ%C?Io0M1@AD3u9jEkyf=@E#nF-uYRHL=%MG|7a=M(8hkgqfur^eYXLYg zpbncNb~Z+HzMEYT6|Dyi&lix+;C?`U_no&&w(t1GagS%V&}1^PD`>G;;M}=SL9dU1 zty{O^TaR_#=SKzcghoZ3De(QbkV63U)z|LYgiihBLE!ps&Rqp{umNZ`3{`&kzFC%} zqv&BF4YstjjGp+*pPzZ8c*DaEhjZU<%4tZ)Ega|#@e*P%P zm@<&(u^wTD*b&!ASY_w9etui-Q#u#!gZJOtsmy<)6dwa&gPKw|wPQTT07jJCAD0Lj zb{80ohyw(r>@Na$6n=kc7hw!b{j}HDLe4Jqf5Ds)E`=wYO40GU-R{c=4jd{V@0k*6 zOcAI?!{W}&p`Mk-MR9%_R%*+<0I;T&p5CER_-thI7&R%}J^T|BPF*;PabD!eV6Jji zia8@T`pJA`Mk)X@tAO%t*B32=CS=jB@#(5\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 4dccf5d56f..c9483b0e0c 100644 --- a/apps/grouping/views.py +++ b/apps/grouping/views.py @@ -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)) From 9f4112187e6b5bc0cbb3238f42e0e5bb9be0a54e Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 18 Nov 2011 23:08:01 -0400 Subject: [PATCH 6/8] 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, From 7a32eccc1939560f4b73c905495ce0d48116826c Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 18 Nov 2011 23:29:19 -0400 Subject: [PATCH 7/8] More document grouping rename updates --- apps/grouping/forms.py | 8 ++++---- apps/grouping/managers.py | 2 +- apps/grouping/models.py | 4 ++-- apps/grouping/views.py | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/grouping/forms.py b/apps/grouping/forms.py index 0aa5df627e..506b20ee6d 100644 --- a/apps/grouping/forms.py +++ b/apps/grouping/forms.py @@ -105,17 +105,17 @@ class SmartLinkImageWidget(forms.widgets.Widget): 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(SmartLinkInstanceForm, self).__init__(*args, **kwargs) - for group, data in groups.items(): - self.fields['preview-%s' % group] = forms.CharField( + 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 bd8e3d1348..ab032cec19 100644 --- a/apps/grouping/models.py +++ b/apps/grouping/models.py @@ -1,7 +1,7 @@ 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 @@ -11,7 +11,7 @@ class DocumentGroup(models.Model): 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 diff --git a/apps/grouping/views.py b/apps/grouping/views.py index 348538d38a..e6085b9d4f 100644 --- a/apps/grouping/views.py +++ b/apps/grouping/views.py @@ -59,7 +59,7 @@ def smart_link_instances_for_document(request, document_id): subtemplates_list = [] document = get_object_or_404(Document, pk=document_id) - smart_links, 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'Smart link query error: %s' % error)) @@ -67,15 +67,15 @@ def smart_link_instances_for_document(request, document_id): 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 smart_links: + if smart_link_instances: subtemplates_list = [{ 'name': 'generic_form_subtemplate.html', 'context': { - 'title': _(u'smart links (%s)') % len(smart_links.keys()), + 'title': _(u'smart links (%s)') % len(smart_link_instances.keys()), 'form': SmartLinkInstanceForm( - groups=smart_links, current_document=document, + smart_link_instances=smart_link_instances, current_document=document, links=[smart_link_instance_view_link] ), 'form_action': reverse('smart_link_action'), From ad53632f7ff6759c7f1665b234a38870370f423c Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 18 Nov 2011 23:29:40 -0400 Subject: [PATCH 8/8] Added smart linking setup help --- apps/grouping/__init__.py | 4 ++-- apps/grouping/templates/smart_links_help.html | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 apps/grouping/templates/smart_links_help.html diff --git a/apps/grouping/__init__.py b/apps/grouping/__init__.py index 18b0ce37f4..fc014bce6f 100644 --- a/apps/grouping/__init__.py +++ b/apps/grouping/__init__.py @@ -1,6 +1,6 @@ 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 @@ -8,7 +8,6 @@ from documents.models import Document 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')} @@ -42,3 +41,4 @@ register_links(['document_group_list', 'document_group_create', 'document_group_ 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/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 %}

+