WebSite_viewAgentWorklistRenderer : correct a problem, and reindent all source...

WebSite_viewAgentWorklistRenderer : correct a problem, and reindent all source code to be easier to understant. Improve comments in ERP5EGov_Extensions.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23447 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_egov/ExtensionTemplateItem/ERP5EGov_Extensions.py

@@ -44,7 +44,7 @@ def getPortalTypeWorklistDictForWorkflow(self, workflow_list):
     return a dict containing portal_type and all informations about work_list
     of workflow :
 
-    {'Subscription Form': {('signed',): {'category': 'global',
+    {'Subscription Form': {'signed': {'category': 'global',
                                          'count': 1,
                                          'description': 'Subscription Forms to archive',
                                          'formated_name': 'Subscription Forms to archive (%(count)s)',
@@ -52,7 +52,7 @@ def getPortalTypeWorklistDictForWorkflow(self, workflow_list):
 ',
                                          'id': 'subscription_forms_to_archive',
                                          'roles': ('Assignor',),
-                                         'validation_state': ('signed',)}
+                                         'validation_state': 'signed'}
                           },
               .....
 

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewAgentWorklistRenderer.xml

@@ -67,20 +67,26 @@ Description:\n
     <div class="tabbertab">\n
       <h2 i18n:translate="" i18n:domain="ui">Pending Applications</h2>\n
       <img alt="Track Application Logo" src="img/track_application.png"/>\n
-\n
-\n
       <tal:block tal:define="global portal_type_dict python:\n
-      here.getPortalTypeWorklistDictForWorkflow(context, workflow_list=[\'egov_universal_workflow\', \'egov_anonymous_workflow\'])" />\n
+        here.getPortalTypeWorklistDictForWorkflow(context, \n
+        workflow_list=[\'egov_universal_workflow\', \'egov_anonymous_workflow\'])" />\n
       <ul tal:condition="python: portal_type_dict">\n
         <li tal:repeat="portal_type python: portal_type_dict.keys()">\n
-          <span class ="portal_type" tal:content="portal_type" i18n:domain="ui" i18n:translate="">portal_type</span>\n
+          <span class ="portal_type" tal:content="portal_type" \n
+            i18n:domain="ui" i18n:translate="">portal_type\n
+          </span>\n
           : \n
-          <tal:block tal:repeat="worklist python: portal_type_dict[portal_type].values()">\n
-              <tal:block tal:define="index python: worklist[\'id\']">\n
-                <span class="state" tal:attributes="class python:\'%s_state\' % worklist[\'validation_state\'][0]" tal:content="python: worklist[\'validation_state\'][0]">state</span> : \n
-                <a class="action_number" tal:content="python: worklist[\'count\']"\n
-                   href="link" tal:attributes="href worklist/formated_url">action_number</a>\n
-              </tal:block>\n
+          <tal:block tal:repeat="worklist_list python: \n
+                                  portal_type_dict[portal_type].values()">\n
+            <span class="state" tal:attributes="class python:\'%s_state\' % \n
+              worklist_list[\'validation_state\']" \n
+              i18n:translate="" i18n:domain="ui" \n
+              tal:content="python: worklist_list[\'validation_state\']">\n
+              state\n
+            </span> : \n
+            <a class="action_number" tal:content="python: worklist_list[\'count\']"\n
+              href="link" tal:attributes="href worklist_list/formated_url">action_number\n
+            </a>\n
             ; \n
           </tal:block>\n
         </li>\n
@@ -88,47 +94,11 @@ Description:\n
       <div tal:condition="python: not portal_type_dict">\n
         Nothing to do !\n
       </div>\n
-<!--\n
-\n
-\n
-      <tal:block tal:define="actions python: here.getPortalObject().portal_actions.listFilteredActionsFor(here);\n
-                             global workilist_not_empty python: True">\n
-        <ul class="select_favorite"\n
-                tal:define="ordered_global_actions python:here.getOrderedGlobalActionList(actions[\'global\']);\n
-                user_actions actions/user;">\n
-          <tal:block tal:repeat="action ordered_global_actions">\n
-            <tal:block tal:condition="python: action[\'disabled\']!=1 and action.has_key(\'workflow_id\')"\n
-                       tal:define="name python: action.get(\'name\', \'\');\n
-                       index python: name.find(\' (\');">\n
-              <tal:block tal:define="global workilist_not_empty python: False" />\n
-              <li>\n
-                <a href="link" tal:attributes="href action/url"\n
-                      tal:content="action/name"\n
-                      i18n:translate="" i18n:domain="ui">\n
-                </a>\n
-              </li>\n
-            </tal:block>\n
-          </tal:block>\n
-        </ul>\n
-      </tal:block>\n
-\n
-      <div tal:condition="workilist_not_empty">\n
-        Nothing to do !\n
-      </div>\n
-\n
-\n
-      -->\n
-\n
-\n
-\n
-\n
-\n
-\n
       <div class="clear"></div>\n
     </div>\n
   </div>\n
-<div class="clear">\n
-</div>\n
+  <div class="clear">\n
+  </div>\n
 </tal:block>\n
 
 

bt5/erp5_egov/bt/revision

-261
+262
\ No newline at end of file