diff --git a/bt5/erp5_egov/ExtensionTemplateItem/ERP5EGov_Extensions.py b/bt5/erp5_egov/ExtensionTemplateItem/ERP5EGov_Extensions.py index 92351964d8015ffe4874412b17c1e360c23059c2..011b345b1a6401165f278ccd781b539fb5654229 100644 --- a/bt5/erp5_egov/ExtensionTemplateItem/ERP5EGov_Extensions.py +++ b/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'} }, ..... diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewAgentWorklistRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewAgentWorklistRenderer.xml index 86928baa395779601065ecce9bdaeea46098b3f7..50176edb5c09cffc0ec16b0a40fb0366cbb5b7ab 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewAgentWorklistRenderer.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewAgentWorklistRenderer.xml @@ -67,68 +67,38 @@ 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 - ; \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 </ul>\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 diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision index c390b4cff15f60e3c7c12561c444c6f029cb8ef2..bb81456fa19cded30402e6818c590bde4d91ead9 100644 --- a/bt5/erp5_egov/bt/revision +++ b/bt5/erp5_egov/bt/revision @@ -1 +1 @@ -261 \ No newline at end of file +262 \ No newline at end of file