# HG changeset patch # User Thierry Florac # Date 1453195741 -3600 # Node ID dc24c94058dabb22fc2aa21bb53c97e7d49e91be # Parent 2539b0bc83049f4f2c49b0547aec647b669bc803 Version 0.1.2 diff -r 2539b0bc8304 -r dc24c94058da buildout.cfg --- a/buildout.cfg Tue Jan 19 10:27:45 2016 +0100 +++ b/buildout.cfg Tue Jan 19 10:29:01 2016 +0100 @@ -77,4 +77,4 @@ eggs = pyams_workflow [test] [versions] -pyams_workflow = 0.1.1 +pyams_workflow = 0.1.2 diff -r 2539b0bc8304 -r dc24c94058da docs/HISTORY.txt --- a/docs/HISTORY.txt Tue Jan 19 10:27:45 2016 +0100 +++ b/docs/HISTORY.txt Tue Jan 19 10:29:01 2016 +0100 @@ -1,6 +1,11 @@ History ======= +0.1.2 +----- + - added fields in publication interface + - added arguments to get versions in sorted order + 0.1.1 ----- - updated workflow interfaces diff -r 2539b0bc8304 -r dc24c94058da setup.py --- a/setup.py Tue Jan 19 10:27:45 2016 +0100 +++ b/setup.py Tue Jan 19 10:29:01 2016 +0100 @@ -22,7 +22,7 @@ README = os.path.join(DOCS, 'README.txt') HISTORY = os.path.join(DOCS, 'HISTORY.txt') -version = '0.1.1' +version = '0.1.2' long_description = open(README).read() + '\n\n' + open(HISTORY).read() tests_require = [] diff -r 2539b0bc8304 -r dc24c94058da src/pyams_workflow.egg-info/PKG-INFO --- a/src/pyams_workflow.egg-info/PKG-INFO Tue Jan 19 10:27:45 2016 +0100 +++ b/src/pyams_workflow.egg-info/PKG-INFO Tue Jan 19 10:29:01 2016 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pyams-workflow -Version: 0.1.1 +Version: 0.1.2 Summary: PyAMS workflow manager Home-page: http://hg.ztfy.org/pyams/pyams_workflow Author: Thierry Florac @@ -11,6 +11,11 @@ History ======= + 0.1.2 + ----- + - added fields in publication interface + - added arguments to get versions in sorted order + 0.1.1 ----- - updated workflow interfaces diff -r 2539b0bc8304 -r dc24c94058da src/pyams_workflow/locales/fr/LC_MESSAGES/pyams_workflow.mo Binary file src/pyams_workflow/locales/fr/LC_MESSAGES/pyams_workflow.mo has changed diff -r 2539b0bc8304 -r dc24c94058da src/pyams_workflow/locales/fr/LC_MESSAGES/pyams_workflow.po --- a/src/pyams_workflow/locales/fr/LC_MESSAGES/pyams_workflow.po Tue Jan 19 10:27:45 2016 +0100 +++ b/src/pyams_workflow/locales/fr/LC_MESSAGES/pyams_workflow.po Tue Jan 19 10:29:01 2016 +0100 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2015-10-05 12:07+0200\n" +"POT-Creation-Date: 2016-01-18 16:25+0100\n" "PO-Revision-Date: 2015-05-12 11:59+0200\n" "Last-Translator: Thierry Florac \n" "Language-Team: French \n" @@ -20,7 +20,12 @@ msgid "-- unknown --" msgstr "-- inconnu --" -#: src/pyams_workflow/content.py:155 +#: src/pyams_workflow/content.py:68 +#, python-format +msgid "{date} by {principal}" +msgstr "{date} par {principal}" + +#: src/pyams_workflow/content.py:165 #, python-format msgid "Clone created from version {source}" msgstr "Duplication de la version {source}" @@ -56,7 +61,7 @@ msgstr "Intervenant" #: src/pyams_workflow/zmi/versions.py:128 -#: src/pyams_workflow/interfaces/__init__.py:432 +#: src/pyams_workflow/interfaces/__init__.py:442 msgid "Comment" msgstr "Commentaire" @@ -108,9 +113,9 @@ msgstr "Utilisateur ayant défini ce statut" #: src/pyams_workflow/interfaces/__init__.py:310 -#: src/pyams_workflow/interfaces/__init__.py:423 +#: src/pyams_workflow/interfaces/__init__.py:433 msgid "Urgent request?" -msgstr "Sollicitation urgente ?" +msgstr "Demande urgente ?" #: src/pyams_workflow/interfaces/__init__.py:357 msgid "Workflow name" @@ -128,56 +133,74 @@ msgid "This permission will be required to display content" msgstr "Cette permission sera nécessaire pour afficher le contenu" -#: src/pyams_workflow/interfaces/__init__.py:379 +#: src/pyams_workflow/interfaces/__init__.py:380 msgid "Transition ID" msgstr "ID de la transition" -#: src/pyams_workflow/interfaces/__init__.py:386 +#: src/pyams_workflow/interfaces/__init__.py:387 msgid "Publication date" msgstr "Date de publication" -#: src/pyams_workflow/interfaces/__init__.py:387 +#: src/pyams_workflow/interfaces/__init__.py:388 msgid "Last date at which content was accepted for publication" msgstr "Dernière date à laquelle le contenu a été accepté pour publication" -#: src/pyams_workflow/interfaces/__init__.py:390 +#: src/pyams_workflow/interfaces/__init__.py:391 +msgid "Publisher" +msgstr "Publié par" + +#: src/pyams_workflow/interfaces/__init__.py:392 +msgid "Name of the manager who published the document" +msgstr "Nom du responsable ayant publié ce contenu" + +#: src/pyams_workflow/interfaces/__init__.py:395 +msgid "Publication" +msgstr "Mise en ligne" + +#: src/pyams_workflow/interfaces/__init__.py:396 +msgid "Last publication date and actor" +msgstr "Date et nom du responsable ayant effectué la mise en ligne" + +#: src/pyams_workflow/interfaces/__init__.py:400 msgid "First publication date" msgstr "Première date de publication" -#: src/pyams_workflow/interfaces/__init__.py:391 +#: src/pyams_workflow/interfaces/__init__.py:401 msgid "First date at which content was accepted for publication" msgstr "Première date à laquelle ce contenu a été accepté pour publication" -#: src/pyams_workflow/interfaces/__init__.py:394 +#: src/pyams_workflow/interfaces/__init__.py:404 msgid "Publication start date" msgstr "Début de publication" -#: src/pyams_workflow/interfaces/__init__.py:395 +#: src/pyams_workflow/interfaces/__init__.py:405 msgid "Date from which content will be visible" -msgstr "Date à partir de laquelle ce contenu sera visible" +msgstr "Date et heure à partir desquelles ce contenu sera visible" -#: src/pyams_workflow/interfaces/__init__.py:398 +#: src/pyams_workflow/interfaces/__init__.py:408 msgid "Publication end date" msgstr "Fin de publication" -#: src/pyams_workflow/interfaces/__init__.py:399 +#: src/pyams_workflow/interfaces/__init__.py:409 msgid "Date past which content will not be visible" -msgstr "Date à partir de laquelle ce contenu ne sera plus consultable" +msgstr "" +"S'il y a lieu, date et heure à partir desquelles ce contenu ne devra plus " +"être consultable" -#: src/pyams_workflow/interfaces/__init__.py:424 +#: src/pyams_workflow/interfaces/__init__.py:434 msgid "Please use this option only when really needed..." msgstr "Veillez à réserver l'urgence aux situations qui le méritent..." -#: src/pyams_workflow/interfaces/__init__.py:433 +#: src/pyams_workflow/interfaces/__init__.py:443 msgid "Comment associated with this operation" msgstr "Commentaire associé à cette opération" -#: src/pyams_workflow/interfaces/__init__.py:406 +#: src/pyams_workflow/interfaces/__init__.py:416 msgid "Can't define publication end date without publication start date!" msgstr "" "Impossible de définir une date de fin de publication sans date de début !" -#: src/pyams_workflow/interfaces/__init__.py:408 +#: src/pyams_workflow/interfaces/__init__.py:418 msgid "Publication end date must be defined after publication start date!" msgstr "" "La date de fin de publication doit être postérieure à la date de début !" diff -r 2539b0bc8304 -r dc24c94058da src/pyams_workflow/locales/pyams_workflow.pot --- a/src/pyams_workflow/locales/pyams_workflow.pot Tue Jan 19 10:27:45 2016 +0100 +++ b/src/pyams_workflow/locales/pyams_workflow.pot Tue Jan 19 10:29:01 2016 +0100 @@ -1,12 +1,12 @@ # # SOME DESCRIPTIVE TITLE # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , 2015. +# FIRST AUTHOR , 2016. #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2015-10-05 12:07+0200\n" +"POT-Creation-Date: 2016-01-18 16:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -20,7 +20,12 @@ msgid "-- unknown --" msgstr "" -#: ./src/pyams_workflow/content.py:155 +#: ./src/pyams_workflow/content.py:68 +#, python-format +msgid "{date} by {principal}" +msgstr "" + +#: ./src/pyams_workflow/content.py:165 #, python-format msgid "Clone created from version {source}" msgstr "" @@ -56,7 +61,7 @@ msgstr "" #: ./src/pyams_workflow/zmi/versions.py:128 -#: ./src/pyams_workflow/interfaces/__init__.py:432 +#: ./src/pyams_workflow/interfaces/__init__.py:442 msgid "Comment" msgstr "" @@ -108,7 +113,7 @@ msgstr "" #: ./src/pyams_workflow/interfaces/__init__.py:310 -#: ./src/pyams_workflow/interfaces/__init__.py:423 +#: ./src/pyams_workflow/interfaces/__init__.py:433 msgid "Urgent request?" msgstr "" @@ -128,54 +133,70 @@ msgid "This permission will be required to display content" msgstr "" -#: ./src/pyams_workflow/interfaces/__init__.py:379 +#: ./src/pyams_workflow/interfaces/__init__.py:380 msgid "Transition ID" msgstr "" -#: ./src/pyams_workflow/interfaces/__init__.py:386 -msgid "Publication date" -msgstr "" - #: ./src/pyams_workflow/interfaces/__init__.py:387 +msgid "Publication date" +msgstr "" + +#: ./src/pyams_workflow/interfaces/__init__.py:388 msgid "Last date at which content was accepted for publication" msgstr "" -#: ./src/pyams_workflow/interfaces/__init__.py:390 -msgid "First publication date" +#: ./src/pyams_workflow/interfaces/__init__.py:391 +msgid "Publisher" msgstr "" -#: ./src/pyams_workflow/interfaces/__init__.py:391 -msgid "First date at which content was accepted for publication" -msgstr "" - -#: ./src/pyams_workflow/interfaces/__init__.py:394 -msgid "Publication start date" +#: ./src/pyams_workflow/interfaces/__init__.py:392 +msgid "Name of the manager who published the document" msgstr "" #: ./src/pyams_workflow/interfaces/__init__.py:395 +msgid "Publication" +msgstr "" + +#: ./src/pyams_workflow/interfaces/__init__.py:396 +msgid "Last publication date and actor" +msgstr "" + +#: ./src/pyams_workflow/interfaces/__init__.py:400 +msgid "First publication date" +msgstr "" + +#: ./src/pyams_workflow/interfaces/__init__.py:401 +msgid "First date at which content was accepted for publication" +msgstr "" + +#: ./src/pyams_workflow/interfaces/__init__.py:404 +msgid "Publication start date" +msgstr "" + +#: ./src/pyams_workflow/interfaces/__init__.py:405 msgid "Date from which content will be visible" msgstr "" -#: ./src/pyams_workflow/interfaces/__init__.py:398 +#: ./src/pyams_workflow/interfaces/__init__.py:408 msgid "Publication end date" msgstr "" -#: ./src/pyams_workflow/interfaces/__init__.py:399 +#: ./src/pyams_workflow/interfaces/__init__.py:409 msgid "Date past which content will not be visible" msgstr "" -#: ./src/pyams_workflow/interfaces/__init__.py:424 +#: ./src/pyams_workflow/interfaces/__init__.py:434 msgid "Please use this option only when really needed..." msgstr "" -#: ./src/pyams_workflow/interfaces/__init__.py:433 +#: ./src/pyams_workflow/interfaces/__init__.py:443 msgid "Comment associated with this operation" msgstr "" -#: ./src/pyams_workflow/interfaces/__init__.py:406 +#: ./src/pyams_workflow/interfaces/__init__.py:416 msgid "Can't define publication end date without publication start date!" msgstr "" -#: ./src/pyams_workflow/interfaces/__init__.py:408 +#: ./src/pyams_workflow/interfaces/__init__.py:418 msgid "Publication end date must be defined after publication start date!" msgstr "" diff -r 2539b0bc8304 -r dc24c94058da src/pyams_workflow/zmi/transition.py --- a/src/pyams_workflow/zmi/transition.py Tue Jan 19 10:27:45 2016 +0100 +++ b/src/pyams_workflow/zmi/transition.py Tue Jan 19 10:29:01 2016 +0100 @@ -9,7 +9,6 @@ # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # FOR A PARTICULAR PURPOSE. # -from pyams_form.form import AJAXAddForm __docformat__ = 'restructuredtext' @@ -22,6 +21,7 @@ from z3c.form.interfaces import HIDDEN_MODE # import packages +from pyams_form.form import AJAXAddForm from pyams_utils.registry import query_utility from pyams_utils.traversing import get_parent from pyams_utils.url import absolute_url diff -r 2539b0bc8304 -r dc24c94058da src/pyams_workflow/zmi/viewlet/templates/versions.pt --- a/src/pyams_workflow/zmi/viewlet/templates/versions.pt Tue Jan 19 10:27:45 2016 +0100 +++ b/src/pyams_workflow/zmi/viewlet/templates/versions.pt Tue Jan 19 10:29:01 2016 +0100 @@ -1,4 +1,4 @@ -