2010-06-26 mayoro

* Add erp5_html_compatibility in EGov registered skin selection, needed for form_view_dialog
* Use  catalog to search for attachments
* Make change password available just for Person or Organisation accounts (not for procedure)

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

bt5/erp5_egov/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml

@@ -3,6 +3,10 @@
   <skin_folder>erp5_egov_theme</skin_folder>
   <skin_selection>EGov</skin_selection>
  </skin_folder_selection>
+ <skin_folder_selection>
+  <skin_folder>erp5_html_compatibility</skin_folder>
+  <skin_selection>EGov</skin_selection>
+ </skin_folder_selection>
  <skin_folder_selection>
   <skin_folder>erp5_xhtml_style</skin_folder>
   <skin_selection>EGov</skin_selection>

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml

@@ -65,12 +65,10 @@ file_type_list = (\'Image\', \'File\')\n
 sub_form_type_list = filter(lambda x: x not in file_type_list, type_list)\n
 \n
 # A simple solution: use title to group\n
-viewable_content_list = context.contentValues(portal_type=type_list, checked_permission=\'View\')\n
+viewable_content_list = [x.getObject() for x in context.searchFolder(validation_state = [\'embedded\',\'draft\'])]\n
 \n
 content_group_dict = {}\n
 for content in viewable_content_list:\n
-  #if content.getValidationState() != \'draft\':\n
-  #  continue\n
   title = content.getTitle()\n
   content_group_dict.setdefault(title, [])\n
   content_group_dict[title].append(content)\n
@@ -172,9 +170,12 @@ return result\n
                             <string>file_type_list</string>
                             <string>filter</string>
                             <string>sub_form_type_list</string>
+                            <string>append</string>
+                            <string>$append0</string>
+                            <string>_getiter_</string>
+                            <string>x</string>
                             <string>viewable_content_list</string>
                             <string>content_group_dict</string>
-                            <string>_getiter_</string>
                             <string>content</string>
                             <string>title</string>
                             <string>_getitem_</string>

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/WebSite_logout.xml

@@ -80,6 +80,14 @@ return website.Base_redirect(form_id, keep_items = {\'portal_status_message\' :
             <key> <string>_params</string> </key>
             <value> <string>dialog_id=None, editable_mode=0, **kw</string> </value>
         </item>
+        <item>
+            <key> <string>_proxy_roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>errors</string> </key>
             <value>

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

@@ -50,7 +50,7 @@
     <span class="onright">\n
       <a class="home" tal:attributes="href python:context.getWebSiteValue().absolute_url()" href="./home" \n
         i18n:translate="" i18n:domain="ui">Home</a>\n
-      <a class="preferences" tal:condition="python: not here.portal_membership.isAnonymousUser()" 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
       <tal:block tal:condition="python: context.getPrintFormUrl() is not None">\n
         <a class="print" href="PDFDocument_viewAsPdf"\n

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

@@ -54,7 +54,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: not here.portal_membership.isAnonymousUser()" 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

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

@@ -52,7 +52,7 @@
       <a class="home" tal:condition="python: context.EGov_checkUserIsAPersonOrOrganisation()==True" tal:attributes="href python:context.getWebSiteValue().absolute_url()" href="./home" \n
         i18n:translate="" i18n:domain="ui">Home</a>\n
 \n
-      <a class="preferences" tal:condition="python: not here.portal_membership.isAnonymousUser()" 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
       <a class="logout" href="WebSite_logout" i18n:translate="" i18n:domain="ui">Logout</a> \n

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

@@ -55,7 +55,7 @@
           href="./home" i18n:translate="" i18n:domain="ui">Home</a>\n
       <!--\n
 \n
-      <a class="preferences" tal:condition="python: not here.portal_membership.isAnonymousUser()" 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
       <tal:block tal:condition="not:here/portal_membership/isAnonymousUser">\n

bt5/erp5_egov/bt/change_log

+2010-06-26 mayoro
+* Add erp5_html_compatibility in EGov registered skin selection, needed for form_view_dialog
+* Use  catalog to search for attachments
+* Make change password available just for Person or Organisation accounts (not for procedure)
+
 2010-06-25 mayoro
 * remove tenderer in Folder_viewEgovContentList (unused)
 

bt5/erp5_egov/bt/revision

-637
\ No newline at end of file
+645
\ No newline at end of file

bt5/erp5_egov/bt/template_registered_skin_selection_list

 erp5_egov_theme | EGov
+erp5_html_compatibility | EGov
 erp5_xhtml_style | EGov
\ No newline at end of file