[Erp5-report] r23447 - in /erp5/trunk/bt5/erp5_egov: ExtensionTemplateItem/ SkinTemplateIte...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Sep 5 13:59:53 CEST 2008
Author: fabien
Date: Fri Sep 5 13:59:48 2008
New Revision: 23447
URL: http://svn.erp5.org?rev=23447&view=rev
Log:
WebSite_viewAgentWorklistRenderer : correct a problem, and reindent all source code to be easier to understant. Improve comments in ERP5EGov_Extensions.
Modified:
erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/ERP5EGov_Extensions.py
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewAgentWorklistRenderer.xml
erp5/trunk/bt5/erp5_egov/bt/revision
Modified: erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/ERP5EGov_Extensions.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/ERP5EGov_Extensions.py?rev=23447&r1=23446&r2=23447&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/ERP5EGov_Extensions.py (original)
+++ erp5/trunk/bt5/erp5_egov/ExtensionTemplateItem/ERP5EGov_Extensions.py Fri Sep 5 13:59:48 2008
@@ -44,7 +44,7 @@
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 @@
',
'id': 'subscription_forms_to_archive',
'roles': ('Assignor',),
- 'validation_state': ('signed',)}
+ 'validation_state': 'signed'}
},
.....
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewAgentWorklistRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewAgentWorklistRenderer.xml?rev=23447&r1=23446&r2=23447&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewAgentWorklistRenderer.xml (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewAgentWorklistRenderer.xml Fri Sep 5 13:59:48 2008
@@ -67,68 +67,38 @@
<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
Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=23447&r1=23446&r2=23447&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision Fri Sep 5 13:59:48 2008
@@ -1,1 +1,1 @@
-261
+262
More information about the Erp5-report
mailing list