[Erp5-report] r17168 - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp5_bas...

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Oct 24 16:09:50 CEST 2007


Author: jerome
Date: Wed Oct 24 16:09:49 2007
New Revision: 17168

URL: http://svn.erp5.org?rev=17168&view=rev
Log:
2007-10-24 Jerome
* rename career workflow state variable in 'validation_state'

Added:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_translated_validation_state_title.xml
    erp5/trunk/bt5/erp5_base/bt/template_tool_id_list
Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml
    erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow.xml
    erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml
    erp5/trunk/bt5/erp5_base/bt/change_log
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml?rev=17168&r1=17167&r2=17168&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view.xml Wed Oct 24 16:09:49 2007
@@ -106,7 +106,7 @@
                         <string>my_salary_coefficient</string>
                         <string>my_salary_level</string>
                         <string>my_skill_list</string>
-                        <string>my_state_title</string>
+                        <string>my_translated_validation_state_title</string>
                       </list>
                     </value>
                 </item>

Added: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_translated_validation_state_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_translated_validation_state_title.xml?rev=17168&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_translated_validation_state_title.xml (added)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Career_view/my_translated_validation_state_title.xml Wed Oct 24 16:09:49 2007
@@ -1,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>my_translated_validation_state_title</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string>my_translated_workflow_state_title</string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string>Base_viewFieldLibrary</string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string>Click to edit the target</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow.xml?rev=17168&r1=17167&r2=17168&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow.xml (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow.xml Wed Oct 24 16:09:49 2007
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -70,7 +67,7 @@
         </item>
         <item>
             <key> <string>state_var</string> </key>
-            <value> <string>state</string> </value>
+            <value> <string>validation_state</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

Modified: erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml?rev=17168&r1=17167&r2=17168&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml (original)
+++ erp5/trunk/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/scripts/Career_checkUniqueActiveCareer.xml Wed Oct 24 16:09:49 2007
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -80,10 +77,11 @@
 \n
 # Count the number of opened career\n
 for career in person_object.contentValues(filter={\'portal_type\': \'Career\'}):\n
-  if career.getState() == \'open\':\n
+  if career.getValidationState() == \'open\':\n
     active_careers.append(career.getTitleOrId())\n
 \n
 # There is at least one open career, so we can\'t open a new one until the current one is inactive (closed or cancelled)\n
+# XXX is this check really needed ?\n
 if len(active_careers) > 0:\n
   raise ValidationFailed, "Error : current active career (\'" + "\', \'".join(active_careers) + "\') must be inactive"\n
 

Modified: erp5/trunk/bt5/erp5_base/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/change_log?rev=17168&r1=17167&r2=17168&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_base/bt/change_log Wed Oct 24 16:09:49 2007
@@ -1,3 +1,6 @@
+2007-10-24 Jerome
+* rename career workflow state variable in 'validation_state'
+
 2007-10-10 Kazuhiko
 * add a read-only field of filename in File view and Image view.
 

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=17168&r1=17167&r2=17168&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision Wed Oct 24 16:09:49 2007
@@ -1,1 +1,1 @@
-208
+210

Added: erp5/trunk/bt5/erp5_base/bt/template_tool_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/template_tool_id_list?rev=17168&view=auto
==============================================================================
    (empty)




More information about the Erp5-report mailing list