From aeb758b645034bb95fe967aca66aa014f5bce97b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Sun, 22 Feb 2015 01:20:21 +0100 Subject: [PATCH 1/1] Utilisation du workflow directement dans le listing des dossiers. --- .../Plinn/locales/en/LC_MESSAGES/plinn.mo | Bin 50333 -> 50227 bytes .../Plinn/locales/en/LC_MESSAGES/plinn.po | 78 ++++++++------- .../Plinn/locales/fr/LC_MESSAGES/plinn.mo | Bin 55686 -> 55235 bytes .../Plinn/locales/fr/LC_MESSAGES/plinn.po | 93 ++++++++++-------- Products/Plinn/locales/plinn.pot | 56 ++++------- .../skins/control/content_status_modify.py | 2 +- .../skins/custom_generic/folder_contents.py | 8 +- .../skins/generic/content_publish_form.pt | 2 +- .../skins/generic/content_reject_form.pt | 8 +- .../skins/generic/folder_contents_macros.pt | 4 + .../skins/generic/folder_jsupload_snippet.py | 4 +- Products/Plinn/skins/generic/wf_redirect.py | 12 +++ Products/Plinn/update-i18n.sh | 2 +- Products/Plinn/utils.py | 8 +- 14 files changed, 148 insertions(+), 129 deletions(-) create mode 100644 Products/Plinn/skins/generic/wf_redirect.py diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo index fa2a7df82e3d8a1e2dd80f018bc9cc2e40c3ca3c..c776485649fe7a4db9cfe6d1647b806db8128a8d 100644 GIT binary patch delta 15453 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 delta 15583 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 RqXxz-F1YQ^voom>@ISu8_~8Hm diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po index 18ef7b0..999c12a 100644 --- a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po +++ b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: 2.0 beta 1\n" -"POT-Creation-Date: Mon Dec 15 15:35:05 2014\n" -"PO-Revision-Date: 2014-12-15 15:41+0100\n" +"POT-Creation-Date: Sat Feb 21 01:11:05 2015\n" +"PO-Revision-Date: 2015-02-21 00:35+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: Zope 3 Developers \n" "Language: \n" @@ -218,7 +218,7 @@ msgid " Change and View " msgstr " Change and View " #: n/skins/content/folder_factories.pt:18 -#: n/skins/custom_generic/folder_contents.py:103 +#: n/skins/custom_generic/folder_contents.py:104 #: n/skins/custom_generic/personalize_form.pt:27 #: n/skins/generic/gruf_macros.pt:256 n/skins/generic/gruf_macros.pt:378 #: n/skins/generic/last_member_logs.pt:23 @@ -525,16 +525,20 @@ msgstr "%d item moved to top.%d items moved to top." msgid "%d item moved up.%d items moved up." msgstr "%d item moved up.%d items moved up." -#: n/skins/custom_generic/folder_contents.py:99 +#: n/skins/custom_generic/folder_contents.py:100 #: n/skins/photo_theme/search_results_macros.pt:14 msgid "Type" msgstr "Type" -#: n/skins/custom_generic/folder_contents.py:107 +#: n/skins/custom_generic/folder_contents.py:108 msgid "Last Modified" msgstr "Last Modified" -#: n/skins/custom_generic/folder_contents.py:117 +#: n/skins/custom_generic/folder_contents.py:112 +msgid "State" +msgstr "State" + +#: n/skins/custom_generic/folder_contents.py:122 msgid "Set Sorting as Default" msgstr "Set Sorting as Default" @@ -1199,30 +1203,6 @@ msgstr "Next" msgid "byline" msgstr "modified on ${date} at ${time} – creator: ${creator}" -#: n/skins/generic/content_depublish_form.pt:8 -msgid "Depublish: \"${docTitle}\"" -msgstr "Depublish: \"${docTitle}\"" - -#: n/skins/generic/content_depublish_form.pt:10 -msgid "depublish_transition_explanations" -msgstr "" - -#: n/skins/generic/content_depublish_form.pt:15 -msgid "Select the destination state" -msgstr "Select the destination state" - -#: n/skins/generic/content_depublish_form.pt:18 -msgid "Private" -msgstr "Private" - -#: n/skins/generic/content_depublish_form.pt:22 -msgid "Shared" -msgstr "Shared" - -#: n/skins/generic/content_depublish_form.pt:26 -msgid "Depublish" -msgstr "Depublish" - #: n/skins/generic/content_make_private_form.pt:10 msgid "Make private: \"${docTitle}\"" msgstr "Make private: \"${docTitle}\"" @@ -1233,6 +1213,7 @@ msgid "make_private_transition_explanations" msgstr "" #: n/skins/generic/content_make_private_form.pt:16 +#: n/skins/generic/content_reject_form.pt:25 msgid "Make private" msgstr "Make private" @@ -1254,18 +1235,13 @@ msgid "Publish" msgstr "Publish" #: n/skins/generic/content_reject_form.pt:8 -msgid "Reject: \"${objectid}\"" -msgstr "Reject: \"${objectid}\"" +msgid "Make private: \"${objectid}\"" +msgstr "Make private: \"${objectid}\"" #: n/skins/generic/content_reject_form.pt:9 -msgid "reject_transition_explanations" +msgid "Make this item private to disable public access" msgstr "" -#: n/skins/generic/content_reject_form.pt:25 -#: n/skins/generic/pending_members.pt:30 -msgid "Reject" -msgstr "Reject" - #: n/skins/generic/content_retract_form.pt:8 msgid "Retract: \"${objectid}\"" msgstr "Retract: \"${objectid}\"" @@ -1644,6 +1620,10 @@ msgstr "Review members registration" msgid "Email" msgstr "Email" +#: n/skins/generic/pending_members.pt:30 +msgid "Reject" +msgstr "Reject" + #: n/skins/generic/pending_members.pt:35 msgid "Register" msgstr "Register" @@ -2015,6 +1995,10 @@ msgstr "(no email sent)" msgid "This item has not had any status changes." msgstr "This item has not had any status changes." +#: n/skins/generic/wf_redirect.py:12 +msgid "You are not allowed to change this content state." +msgstr "You are not allowed to change this content state." + #: n/skins/generic/widgets.pt:32 n/skins/generic/widgets.pt:33 msgid "Edit metadata" msgstr "Edit metadata" @@ -2937,6 +2921,24 @@ msgstr "Directory" msgid "Configure portal" msgstr "Configure portal" +#~ msgid "Depublish: \"${docTitle}\"" +#~ msgstr "Depublish: \"${docTitle}\"" + +#~ msgid "Select the destination state" +#~ msgstr "Select the destination state" + +#~ msgid "Private" +#~ msgstr "Private" + +#~ msgid "Shared" +#~ msgstr "Shared" + +#~ msgid "Depublish" +#~ msgstr "Depublish" + +#~ msgid "Reject: \"${objectid}\"" +#~ msgstr "Reject: \"${objectid}\"" + #~ msgid "Configure Solr delegated indexes" #~ msgstr "Configure Solr delegated indexes" diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo index c99b2ea96e41425bc5e163f782387c6bfc700577..e1f30bcfc3348fe13e571b6a397dff4b876f4d10 100644 GIT binary patch delta 15709 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 NZh5Eqe>Nf0{{c{&Gb#W8 delta 16098 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\n" "Language-Team: Zope 3 Developers \n" @@ -217,7 +217,7 @@ msgid " Change and View " msgstr "" #: n/skins/content/folder_factories.pt:18 -#: n/skins/custom_generic/folder_contents.py:103 +#: n/skins/custom_generic/folder_contents.py:104 #: n/skins/custom_generic/personalize_form.pt:27 #: n/skins/generic/gruf_macros.pt:256 #: n/skins/generic/gruf_macros.pt:378 @@ -524,16 +524,20 @@ msgstr "" msgid "%d item moved up.%d items moved up." msgstr "" -#: n/skins/custom_generic/folder_contents.py:99 +#: n/skins/custom_generic/folder_contents.py:100 #: n/skins/photo_theme/search_results_macros.pt:14 msgid "Type" msgstr "" -#: n/skins/custom_generic/folder_contents.py:107 +#: n/skins/custom_generic/folder_contents.py:108 msgid "Last Modified" msgstr "" -#: n/skins/custom_generic/folder_contents.py:117 +#: n/skins/custom_generic/folder_contents.py:112 +msgid "State" +msgstr "" + +#: n/skins/custom_generic/folder_contents.py:122 msgid "Set Sorting as Default" msgstr "" @@ -1097,30 +1101,6 @@ msgstr "" msgid "byline" msgstr "" -#: n/skins/generic/content_depublish_form.pt:8 -msgid "Depublish: \"${docTitle}\"" -msgstr "" - -#: n/skins/generic/content_depublish_form.pt:10 -msgid "depublish_transition_explanations" -msgstr "" - -#: n/skins/generic/content_depublish_form.pt:15 -msgid "Select the destination state" -msgstr "" - -#: n/skins/generic/content_depublish_form.pt:18 -msgid "Private" -msgstr "" - -#: n/skins/generic/content_depublish_form.pt:22 -msgid "Shared" -msgstr "" - -#: n/skins/generic/content_depublish_form.pt:26 -msgid "Depublish" -msgstr "" - #: n/skins/generic/content_make_private_form.pt:10 msgid "Make private: \"${docTitle}\"" msgstr "" @@ -1131,6 +1111,7 @@ msgid "make_private_transition_explanations" msgstr "" #: n/skins/generic/content_make_private_form.pt:16 +#: n/skins/generic/content_reject_form.pt:25 msgid "Make private" msgstr "" @@ -1152,16 +1133,11 @@ msgid "Publish" msgstr "" #: n/skins/generic/content_reject_form.pt:8 -msgid "Reject: \"${objectid}\"" +msgid "Make private: \"${objectid}\"" msgstr "" #: n/skins/generic/content_reject_form.pt:9 -msgid "reject_transition_explanations" -msgstr "" - -#: n/skins/generic/content_reject_form.pt:25 -#: n/skins/generic/pending_members.pt:30 -msgid "Reject" +msgid "Make this item private to disable public access" msgstr "" #: n/skins/generic/content_retract_form.pt:8 @@ -1541,6 +1517,10 @@ msgstr "" msgid "Email" msgstr "" +#: n/skins/generic/pending_members.pt:30 +msgid "Reject" +msgstr "" + #: n/skins/generic/pending_members.pt:35 msgid "Register" msgstr "" @@ -1864,6 +1844,10 @@ msgstr "" msgid "This item has not had any status changes." msgstr "" +#: n/skins/generic/wf_redirect.py:12 +msgid "You are not allowed to change this content state." +msgstr "" + #: n/skins/generic/widgets.pt:32 #: n/skins/generic/widgets.pt:33 msgid "Edit metadata" diff --git a/Products/Plinn/skins/control/content_status_modify.py b/Products/Plinn/skins/control/content_status_modify.py index b8818d0..66361fe 100644 --- a/Products/Plinn/skins/control/content_status_modify.py +++ b/Products/Plinn/skins/control/content_status_modify.py @@ -14,7 +14,7 @@ if REQUEST : kw.update(REQUEST.form) try : - target = context.getActionInfo('object/history')['url'] + target = context.getParentNode().getActionInfo('object/view')['url'] except ValueError : target = context.getActionInfo('object/view')['url'] diff --git a/Products/Plinn/skins/custom_generic/folder_contents.py b/Products/Plinn/skins/custom_generic/folder_contents.py index d4737f4..e2d1764 100755 --- a/Products/Plinn/skins/custom_generic/folder_contents.py +++ b/Products/Plinn/skins/custom_generic/folder_contents.py @@ -11,7 +11,8 @@ from Products.CMFDefault.permissions import ListFolderContents from Products.CMFDefault.permissions import ManageProperties from Products.CMFDefault.permissions import ViewManagementScreens from Products.CMFDefault.permissions import ModifyPortalContent -from Products.CMFDefault.utils import html_marshal, Message as _ +from Products.CMFDefault.utils import html_marshal#, Message as _ +from Products.Plinn.utils import Message as _ mtool = getToolByName(script, 'portal_membership') checkPermission = mtool.checkPermission @@ -107,6 +108,10 @@ columns = ( {'key': 'Type', 'title': _('Last Modified'), 'width': None, 'colspan': None} + , {'key': 'review_state', + 'title': _('State'), + 'width': None, + 'colspan': None} ) for column in columns: @@ -166,6 +171,7 @@ for item in batch_obj: 'modified': item.modified.strftime(locale_date_fmt), 'title_or_id': item.Title or item_id, 'type': item.Type or None, + 'state': item.review_state, 'url': item_url } ) options['batch'] = { 'listColumnInfos': tuple(columns), diff --git a/Products/Plinn/skins/generic/content_publish_form.pt b/Products/Plinn/skins/generic/content_publish_form.pt index 4abe8fb..46bc8ea 100644 --- a/Products/Plinn/skins/generic/content_publish_form.pt +++ b/Products/Plinn/skins/generic/content_publish_form.pt @@ -17,7 +17,7 @@ Notify by e-mail

diff --git a/Products/Plinn/skins/generic/content_reject_form.pt b/Products/Plinn/skins/generic/content_reject_form.pt index 6f2381c..dc3886d 100644 --- a/Products/Plinn/skins/generic/content_reject_form.pt +++ b/Products/Plinn/skins/generic/content_reject_form.pt @@ -5,8 +5,8 @@
-

Reject: "Item"

-
reject_transition_explanations
+

Make private: "Item"

+
Make this item private to disable public access
@@ -16,13 +16,13 @@ Notify by e-mail

- +
diff --git a/Products/Plinn/skins/generic/folder_contents_macros.pt b/Products/Plinn/skins/generic/folder_contents_macros.pt index b03e11d..bff0d80 100644 --- a/Products/Plinn/skins/generic/folder_contents_macros.pt +++ b/Products/Plinn/skins/generic/folder_contents_macros.pt @@ -61,6 +61,10 @@ 2001 + + pending + diff --git a/Products/Plinn/skins/generic/folder_jsupload_snippet.py b/Products/Plinn/skins/generic/folder_jsupload_snippet.py index f932675..b6a082a 100644 --- a/Products/Plinn/skins/generic/folder_jsupload_snippet.py +++ b/Products/Plinn/skins/generic/folder_jsupload_snippet.py @@ -1,6 +1,7 @@ ##parameters=ob from Products.CMFCore.utils import getUtilityByInterfaceName utool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IURLTool') +wftool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IWorkflowTool') locale_date_fmt = context.locale_date_fmt() infos = {'checkbox' : True, 'url' : ob.absolute_url(), @@ -10,6 +11,7 @@ infos = {'checkbox' : True, 'position' : context.getObjectPosition(ob.getId()), 'type' : ob.Type() or None, 'id' : ob.getId(), - 'icon': '%s/%s' % (utool(), ob.getIcon())} + 'icon': '%s/%s' % (utool(), ob.getIcon()), + 'state' : wftool.getInfoFor(ob, 'review_state')} return context.folder_jsupload_snippet_template(listItemInfos=[infos]) \ No newline at end of file diff --git a/Products/Plinn/skins/generic/wf_redirect.py b/Products/Plinn/skins/generic/wf_redirect.py new file mode 100644 index 0000000..7179333 --- /dev/null +++ b/Products/Plinn/skins/generic/wf_redirect.py @@ -0,0 +1,12 @@ +##parameters= +from Products.Plinn.utils import listWorkflowActions + +actions = listWorkflowActions(context) +redirect = context.REQUEST.RESPONSE.redirect +if actions : + return redirect(actions[0]['url']) +else : + from ZTUtils import make_query as mq + from Products.Plinn.utils import transtlate as _ + return redirect('%s?%s' % (actions[0]['url'], + mq(portal_status_message = _('You are not allowed to change this content state.')))) \ No newline at end of file diff --git a/Products/Plinn/update-i18n.sh b/Products/Plinn/update-i18n.sh index d2283eb..409133a 100755 --- a/Products/Plinn/update-i18n.sh +++ b/Products/Plinn/update-i18n.sh @@ -1,6 +1,6 @@ #! /bin/sh -i18nextract --path . --site_zcml ../../etc/site.zcml --domain plinn -o locales +i18nextract --path . --site_zcml /export/zope_instances/jma/etc/site.zcml --domain plinn -o locales cat locales/plinn.pot locales/plinn-manual.pot > locales/plinn-all.pot mv locales/plinn-all.pot locales/plinn.pot diff --git a/Products/Plinn/utils.py b/Products/Plinn/utils.py index de68f22..f15fd09 100755 --- a/Products/Plinn/utils.py +++ b/Products/Plinn/utils.py @@ -76,10 +76,10 @@ def thisObjectComeFromPortalSkin(ob, portal=None): except BadRequest : return False -security.declarePublic('listActionProviders_') -def listActionProviders_(context) : - atool = getToolByName(context, 'portal_actions') - return atool.listActionProviders() +security.declarePublic('listWorkflowActions') +def listWorkflowActions(context) : + wftool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IWorkflowTool') + return wftool.listActions(object=context) def capitalizeCompoundGivenName(givenName) : givenName = givenName.strip() -- 2.20.1