From e8cb0c94a8901a2f1b9c225c38114824d6f8040e Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Thu, 22 Nov 2012 17:48:33 +0100
Subject: [PATCH] extend task_states definition; make type-based state handling
 fully operational

---
 browser/form_macros.pt          |   3 +-
 expert/browser/search.pt        |   3 +-
 expert/browser/search.py        |   7 ++-
 locales/de/LC_MESSAGES/loops.mo | Bin 19168 -> 20373 bytes
 locales/de/LC_MESSAGES/loops.po | 107 +++++++++++++++++++++++++++-----
 organize/stateful/task.py       |   8 +--
 6 files changed, 105 insertions(+), 23 deletions(-)

diff --git a/browser/form_macros.pt b/browser/form_macros.pt
index 3a332fb..0717f97 100644
--- a/browser/form_macros.pt
+++ b/browser/form_macros.pt
@@ -291,7 +291,8 @@
                     tal:condition="stTrans"
                     tal:attributes="name string:state.$stDef">
               <option i18n:translate="" value="-">No change</option>
-              <option tal:repeat="trans stTrans"
+              <option i18n:translate=""
+                      tal:repeat="trans stTrans"
                       tal:attributes="value trans/name"
                       tal:content="trans/title">publish</option>
             </select>
diff --git a/expert/browser/search.pt b/expert/browser/search.pt
index ac45dd4..2a83202 100644
--- a/expert/browser/search.pt
+++ b/expert/browser/search.pt
@@ -368,7 +368,8 @@
         i18n:translate=""></td>
     <td colspan="2">
       <tal:states repeat="state def/states">
-        <tal:state define="name string:state.$deftype.${def/name};
+        <tal:state define="xx_name string:state.$deftype.${def/name};
+                           name string:state.${def/name};
                            value state/name">
             <input type="checkbox"
                    tal:attributes="name string:$name:list;
diff --git a/expert/browser/search.py b/expert/browser/search.py
index a892395..af4f437 100644
--- a/expert/browser/search.py
+++ b/expert/browser/search.py
@@ -196,8 +196,9 @@ class Search(ConceptView):
 
     @Lazy
     def statesDefinitions(self):
-        return [component.getUtility(IStatesDefinition, name=n)
-                    for n in self.globalOptions('organize.stateful.resource', ())]
+        stdnames = (self.globalOptions('organize.stateful.resource', []) +
+                    self.globalOptions('organize.stateful.special', []))
+        return [component.getUtility(IStatesDefinition, name=n) for n in stdnames]
 
     @Lazy
     def selectedStates(self):
@@ -259,6 +260,8 @@ class Search(ConceptView):
         for std, states in self.selectedStates.items():
             if std.startswith('state.resource.'):
                 std = std[len('state.resource.'):]
+            elif std.startswith('state.'):
+                std = std[len('state.'):]
             else:
                 continue
             stf = component.queryAdapter(obj, IStateful, name=std)
diff --git a/locales/de/LC_MESSAGES/loops.mo b/locales/de/LC_MESSAGES/loops.mo
index 845ab899f549becb8a417b94945544956f133d8e..e863d65a78cf2ba94072c4ea24870b567a773be8 100644
GIT binary patch
delta 8651
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
J86t-Ce*wK@Nd*7^

delta 7419
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
QAU%&QbaK4ef%}yF4-Ss{z5oCK

diff --git a/locales/de/LC_MESSAGES/loops.po b/locales/de/LC_MESSAGES/loops.po
index f849adc..6eec2d7 100644
--- a/locales/de/LC_MESSAGES/loops.po
+++ b/locales/de/LC_MESSAGES/loops.po
@@ -704,9 +704,6 @@ msgstr "Deckungsgrad"
 msgid "Create loops Note"
 msgstr "loops-Notiz anlegen"
 
-msgid "State information for $definition: $title"
-msgstr "Status ($definition): $title"
-
 msgid "User ID"
 msgstr "Benutzerkennung"
 
@@ -885,8 +882,26 @@ msgstr "nach"
 
 # state definitions
 
+msgid "Restrict to objects with certain states"
+msgstr "Auf Objekte mit bestimmtem Status beschränken"
+
+msgid "Workflow"
+msgstr "Statusdefinition/Workflow"
+
+msgid "States"
+msgstr "Statuswerte"
+
+msgid "State information for $definition: $title"
+msgstr "Status ($definition): $title"
+
+msgid "classification_quality"
+msgstr "Klassifizierung"
+
+msgid "simple_publishing"
+msgstr "Veröffentlichung"
+
 msgid "task_states"
-msgstr "Status"
+msgstr "Aufgabe"
 
 # state names
 
@@ -896,9 +911,15 @@ msgstr "angenommen"
 msgid "active"
 msgstr "aktiv"
 
+msgid "archived"
+msgstr "Archiv"
+
 msgid "cancelled"
 msgstr "abgebrochen"
 
+msgid "classified"
+msgstr "klassifiziert"
+
 msgid "closed"
 msgstr "abgeschlossen"
 
@@ -923,40 +944,96 @@ msgstr "neu"
 msgid "planned"
 msgstr "geplant"
 
+msgid "private"
+msgstr "privat"
+
+msgid "published"
+msgstr "veröffentlicht"
+
+msgid "removed"
+msgstr "gelöscht"
+
 msgid "replaced"
 msgstr "ersetzt"
 
 msgid "running"
 msgstr "in Arbeit"
 
-# transitions
+msgid "unclassified"
+msgstr "unklassifiziert"
 
-msgid "plan"
-msgstr "planen"
+msgid "verified"
+msgstr "verifiziert"
+
+# transitions
 
 msgid "accept"
 msgstr "annehmen"
 
-msgid "start working"
-msgstr "Arbeit beginnen"
+msgid "archive"
+msgstr "archivieren"
 
-msgid "work"
-msgstr "bearbeiten"
+msgid "classify"
+msgstr "klassifizieren"
 
-msgid "finish"
-msgstr "beenden"
+msgid "change_classification"
+msgstr "Klassifizierung ändern"
 
 msgid "cancel"
 msgstr "abbrechen"
 
+msgid "close"
+msgstr "abschließen"
+
 msgid "delegate"
 msgstr "delegieren"
 
+msgid "finish"
+msgstr "beenden"
+
+msgid "hide"
+msgstr "verstecken"
+
 msgid "move"
 msgstr "verschieben"
 
-msgid "close"
-msgstr "abschließen"
+msgid "No change"
+msgstr "keine Änderung"
+
+msgid "plan"
+msgstr "planen"
+
+msgid "publish"
+msgstr "veröffentlichen"
+
+msgid "remove"
+msgstr "entfernen"
+
+msgid "release"
+msgstr "freigeben"
+
+msgid "re-open"
+msgstr "zurücksetzen"
+
+msgid "remove_classification"
+msgstr "Klassifizierung entfernen"
+
+msgid "retract"
+msgstr "zurückziehen"
+
+msgid "show"
+msgstr "anzeigen"
+
+msgid "start working"
+msgstr "Arbeit beginnen"
+
+msgid "verify"
+msgstr "verifizieren"
+
+msgid "work"
+msgstr "bearbeiten"
+
+# calendar
 
 msgid "Monday"
 msgstr "Montag"
diff --git a/organize/stateful/task.py b/organize/stateful/task.py
index 6a02fcd..330263a 100644
--- a/organize/stateful/task.py
+++ b/organize/stateful/task.py
@@ -35,17 +35,17 @@ from loops.organize.stateful.base import StatefulLoopsObject
 @implementer(IStatesDefinition)
 def taskStates():
     return StatesDefinition('task_states',
-        State('draft', 'draft', ('start', 'cancel',),
-              color='yellow'),
+        State('draft', 'draft', ('release', 'cancel',),
+              color='blue'),
         State('active', 'active', ('finish', 'cancel',),
               color='yellow'),
         State('finished', 'finished', ('reopen', 'archive',),
               color='green'),
         State('cancelled', 'cancelled', ('reopen',),
-              color='grey'),
+              color='x'),
         State('archived', 'archived', ('reopen',),
               color='grey'),
-        Transition('start', 'start', 'active'),
+        Transition('release', 'release', 'active'),
         Transition('finish', 'finish', 'finished'),
         Transition('cancel', 'cancel', 'cancelled'),
         Transition('reopen', 're-open', 'draft'),