diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderWorkspaceRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderWorkspaceRenderer.xml index ce30421faa6c17d42d1c1930389a815a9adf9a4e..803e68c4f861b7c4e9ec3127cfe6e232a21f05c5 100644 --- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderWorkspaceRenderer.xml +++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderWorkspaceRenderer.xml @@ -51,7 +51,7 @@ <a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" \n href="./home" i18n:translate="" i18n:domain="ui">Home</a>\n </tal:block>\n - <a class="preferences" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True or 1" href="PreferenceTool_viewChangePasswordDialog" \n + <a class="preferences" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True" href="PreferenceTool_viewChangePasswordDialog" \n i18n:translate="" i18n:domain="ui">Change Password</a>\n \n <!--\n diff --git a/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_universal_workflow/worklists/pending_form_to_view.xml b/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_universal_workflow/worklists/pending_form_to_view.xml index 47633bbe7a5ee40078ea1a013c7d0a8d6a4c3f61..e65edacc2c811c02d2453cd48def9a754a935dab 100644 --- a/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_universal_workflow/worklists/pending_form_to_view.xml +++ b/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_universal_workflow/worklists/pending_form_to_view.xml @@ -61,10 +61,8 @@ Base_viewSearchResultList?validation_state=pending&reset=1 <key> <string>roles</string> </key> <value> <tuple> - <string>Auditor</string> <string>Assignee</string> <string>Assignor</string> - <string>Associate</string> </tuple> </value> </item> diff --git a/bt5/erp5_egov/bt/change_log b/bt5/erp5_egov/bt/change_log index a6241cf866356d976090510073becee4b867e4bd..6b006fac2b686d93a87b594590d66ba99b3978c6 100644 --- a/bt5/erp5_egov/bt/change_log +++ b/bt5/erp5_egov/bt/change_log @@ -1,3 +1,7 @@ +2010-07-08 mayoro +* remove wrong condition +* change pending worklist permissions + 2010-07-08 mayoro * add tabber-cookie.js * order action buttons on header workspaces diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision index e34fb7d8539f34598c7ae48bea32d7b5fdb05260..00607554c69b5eef758dc04a2eaaf87137dc40f3 100644 --- a/bt5/erp5_egov/bt/revision +++ b/bt5/erp5_egov/bt/revision @@ -1 +1 @@ -716 \ No newline at end of file +718 \ No newline at end of file