diff --git a/bt5/erp5_egov/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml b/bt5/erp5_egov/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml
index 3ca3d7b3990ff4f7c49b610bd416166d799f9aa4..71f707509d4af0a9d97e209c1e4d73a75f4d9fea 100644
--- a/bt5/erp5_egov/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml
+++ b/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>
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml
index 8f3ac1c886408efdd4790b7ad7aa817d5775e34c..b8adec1b4cdfbe246af460aeb868d858771e557b 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_getReportSectionList.xml
+++ b/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>
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/WebSite_logout.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/WebSite_logout.xml
index 5bcc545955efb277317b7fc80d667f29509b2197..d7b502cdc03fc82aff48c514f256e8f9796ce54c 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/WebSite_logout.xml
+++ b/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>
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderFormRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderFormRenderer.xml
index 92f0c16a6cd5bf1c0b21354f91ced7d9be6db7cb..7a89f8071f16d2480f748b5a6cf1d00819604423 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewGovernmentHeaderFormRenderer.xml
+++ b/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
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 f40e1c8c1d5c1a40561be4e6e11e6023920ac9c7..4307ffeaf4ec1071169a63990b31d90b3b7f42e6 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
@@ -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
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml
index 14131d41ae4e0b23eea58053626554cd210cc2f9..ddd381a23f1ea4f40bdc7b4b18e2c02b07f69f54 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderFormRenderer.xml
+++ b/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
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml
index bdbd35296b5684cc9bf4d3aef64196f39c4eec8d..62bf22cac39aa8d55c14f451f09b87abb38afa88 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewHeaderWorkspaceRenderer.xml
+++ b/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
diff --git a/bt5/erp5_egov/bt/change_log b/bt5/erp5_egov/bt/change_log
index 907be103c951073ddcf763d49cf14957f29a9463..944f09144f1dd9d3568440871ccde21916e45b60 100644
--- a/bt5/erp5_egov/bt/change_log
+++ b/bt5/erp5_egov/bt/change_log
@@ -1,3 +1,8 @@
+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)
diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision
index 748e6f1af544d497e99e1f5c583027349aa4a4c3..0c1a9b6f06b7455bfa5e5419b38675b5d46eb95a 100644
--- a/bt5/erp5_egov/bt/revision
+++ b/bt5/erp5_egov/bt/revision
@@ -1 +1 @@
-637
\ No newline at end of file
+645
\ No newline at end of file
diff --git a/bt5/erp5_egov/bt/template_registered_skin_selection_list b/bt5/erp5_egov/bt/template_registered_skin_selection_list
index 31dcd54d09dd14769cc040e6edf27a0fed0aca67..0f629028c3a51bf1c1aa6b8f184e7e47e349c310 100644
--- a/bt5/erp5_egov/bt/template_registered_skin_selection_list
+++ b/bt5/erp5_egov/bt/template_registered_skin_selection_list
@@ -1,2 +1,3 @@
erp5_egov_theme | EGov
+erp5_html_compatibility | EGov
erp5_xhtml_style | EGov
\ No newline at end of file