From 786ec48e4c176c3815490ec20e1dc86e9e8f7e12 Mon Sep 17 00:00:00 2001
From: Mayoro Diagne <mayoro@nexedi.com>
Date: Wed, 23 Jun 2010 16:27:42 +0000
Subject: [PATCH] 2010-06-23 mayoro * correct redirect url when logout *
 display login and password to track anonymous procedure at the end of
 submission (it's not only for Subscription Form) * remove log in
 EGov_Base_editAndNextStep * configure listbox of
 PDFDocument_viewAnonymousHistory

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36552 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_egov/EGov_Base_editAndNextStep.xml   |   9 +-
 .../erp5_egov/EGov_Base_editAndRedirect.xml   |   8 ++
 .../EGov_getAnonymousProcedurePassword.xml    | 130 ++++++++++++++++++
 .../erp5_egov/EGov_goToDocument.xml           |   6 +-
 .../portal_skins/erp5_egov/EGov_register.xml  |   1 +
 .../listbox.xml                               |  94 +++++++++++--
 .../listbox_application_income.xml            |  69 ++++++++--
 .../listbox_application_outcome.xml           |  52 +++++--
 .../portal_skins/erp5_egov/WebSite_logout.xml |   2 +-
 .../PDFDocument_viewLoginInformationPT.xml    |   4 +-
 .../WebSite_viewRegisterButton.xml            |   2 +-
 bt5/erp5_egov/bt/change_log                   |   6 +
 bt5/erp5_egov/bt/revision                     |   2 +-
 13 files changed, 348 insertions(+), 37 deletions(-)
 create mode 100644 bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getAnonymousProcedurePassword.xml

diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_Base_editAndNextStep.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_Base_editAndNextStep.xml
index 47ba8f14ad..d96f3f56f2 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_Base_editAndNextStep.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_Base_editAndNextStep.xml
@@ -126,7 +126,6 @@ if mode == \'edit\':\n
             document_edit_kw = {\n
               \'title\': title,\n
             }\n
-            context.log(document_new_content_kw)\n
             document.edit(**document_edit_kw)\n
         else:\n
             bad_file = "%s \'%s\' must be %s file"  % (bad_file, attachment.filename, type_dict[title])        \n
@@ -207,6 +206,14 @@ return context.Base_redirect(next_url, keep_items = dict(portal_status_message=m
             <key> <string>_params</string> </key>
             <value> <string>form_id, selection_index=0, selection_name=\'\', dialog_id=\'\', ignore_layout=0, editable_mode=1, silent_mode=0, field_prefix=\'my_\', **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/EGov_Base_editAndRedirect.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_Base_editAndRedirect.xml
index d87b95f28e..12dc762cd2 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_Base_editAndRedirect.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_Base_editAndRedirect.xml
@@ -176,6 +176,14 @@ return context.Base_redirect(next_url, keep_items = dict(portal_status_message=m
             <key> <string>_params</string> </key>
             <value> <string>form_id, next_url, selection_index=0, selection_name=\'\', dialog_id=\'\', ignore_layout=0, editable_mode=1, silent_mode=0, field_prefix=\'my_\', **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/EGov_getAnonymousProcedurePassword.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getAnonymousProcedurePassword.xml
new file mode 100644
index 0000000000..04120b46ed
--- /dev/null
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getAnonymousProcedurePassword.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>return context.getPassword()\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></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>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>EGov_getAnonymousProcedurePassword</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml
index f7f662e430..2bd95e28b2 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml
@@ -70,10 +70,8 @@ if application_number:\n
   if document is not None:\n
     if state == \'draft\':\n
       form_id=\'view\'\n
-    #elif document.getPortalType() == \'Subscription Form\':\n
-    elif not document.getStepAuthentication():\n
-      if state != \'draft\':\n
-        form_id=\'PDFDocument_viewAnonymousHistory\'\n
+    else:\n
+      form_id=\'PDFDocument_viewHistory\'\n
     return document.Base_redirect(form_id=form_id, keep_items=keep_items)\n
 \n
 # Prepare message\n
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml
index d8f6a9b1e5..1ac5f8f7aa 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml
@@ -93,6 +93,7 @@ form.setPassword(password)\n
 # the ownership is the form itself\n
 form.manage_addLocalRoles(new_object_id, [\'Owner\',])\n
 \n
+\n
 # login with this new form\n
 # set in the request wich module is used for this annonymous application\n
 # this is use in PAS\n
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox.xml
index 18670d8bda..506f033419 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox.xml
@@ -17,10 +17,11 @@
                 <string>css_class</string>
                 <string>default_params</string>
                 <string>description</string>
-                <string>list_action</string>
+                <string>list_method</string>
                 <string>page_template</string>
                 <string>selection_name</string>
                 <string>title</string>
+                <string>url_columns</string>
               </list>
             </value>
         </item>
@@ -76,7 +77,9 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
@@ -133,11 +136,15 @@
                         </tuple>
                         <tuple>
                           <string>actor</string>
-                          <string>Actor</string>
+                          <string>Agent</string>
+                        </tuple>
+                        <tuple>
+                          <string>assigned_user</string>
+                          <string>Assigned To</string>
                         </tuple>
                         <tuple>
                           <string>time</string>
-                          <string>Time</string>
+                          <string>Date</string>
                         </tuple>
                         <tuple>
                           <string>assigned_function</string>
@@ -176,11 +183,11 @@
                         </tuple>
                         <tuple>
                           <string>workflow_id</string>
-                          <string>egov_anonymous_workflow</string>
+                          <string>egov_universal_workflow</string>
                         </tuple>
                         <tuple>
                           <string>workflow_title</string>
-                          <string>ERP5 eGov anonymous Workflow</string>
+                          <string>Egov workflow</string>
                         </tuple>
                       </list>
                     </value>
@@ -214,8 +221,10 @@
                     <value> <string>Base_viewWorkflowHistory</string> </value>
                 </item>
                 <item>
-                    <key> <string>list_action</string> </key>
-                    <value> <string>Folder_viewContentList</string> </value>
+                    <key> <string>list_method</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>not_viewable</string> </key>
@@ -231,7 +240,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>egov_annonymous_workflow_history_selection</string> </value>
+                    <value> <string>egov_workflow_history_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>
@@ -241,6 +250,41 @@
                     <key> <string>title</string> </key>
                     <value> <string>Workflow History</string> </value>
                 </item>
+                <item>
+                    <key> <string>url_columns</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>action</string>
+                          <string></string>
+                        </tuple>
+                        <tuple>
+                          <string>state</string>
+                          <string></string>
+                        </tuple>
+                        <tuple>
+                          <string>actor</string>
+                          <string></string>
+                        </tuple>
+                        <tuple>
+                          <string>assigned_user</string>
+                          <string></string>
+                        </tuple>
+                        <tuple>
+                          <string>time</string>
+                          <string>Base_getHistoricalComparisonUrl</string>
+                        </tuple>
+                        <tuple>
+                          <string>comment</string>
+                          <string></string>
+                        </tuple>
+                        <tuple>
+                          <string>error_message</string>
+                          <string></string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>viewable_permission</string> </key>
                     <value>
@@ -259,4 +303,36 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: context.Base_translateString("All steps related to your")+" "+context.Base_translateString(context.getPortalType())</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>method_name</string> </key>
+            <value> <string>EGov_getWorkflowHistoryItemList</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_income.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_income.xml
index 14b4bc7949..a9226439b3 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_income.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_income.xml
@@ -201,7 +201,9 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>domain_root_list</string> </key>
@@ -235,6 +237,10 @@
                     <key> <string>hidden</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>hide_rows_on_no_search_criterion</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>lines</string> </key>
                     <value> <string></string> </value>
@@ -245,9 +251,7 @@
                 </item>
                 <item>
                     <key> <string>list_method</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>meta_types</string> </key>
@@ -269,6 +273,10 @@
                     <key> <string>report_tree</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>row_css_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>search</string> </key>
                     <value> <string></string> </value>
@@ -418,6 +426,10 @@
                     <key> <string>hidden</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>hide_rows_on_no_search_criterion</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>lines</string> </key>
                     <value> <int>20</int> </value>
@@ -428,7 +440,9 @@
                 </item>
                 <item>
                     <key> <string>list_method</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>meta_types</string> </key>
@@ -438,7 +452,7 @@
                 </item>
                 <item>
                     <key> <string>page_template</string> </key>
-                    <value> <string>DeclarationTVA_ListBox_asHTML</string> </value>
+                    <value> <string>EGov_ListBox_asHTML</string> </value>
                 </item>
                 <item>
                     <key> <string>portal_types</string> </key>
@@ -456,6 +470,10 @@
                     <key> <string>report_tree</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>row_css_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>search</string> </key>
                     <value> <int>0</int> </value>
@@ -472,7 +490,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>selection_name_history_view</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
@@ -509,7 +527,24 @@
                 <item>
                     <key> <string>url_columns</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <tuple>
+                          <string>title</string>
+                          <string>PDFDocument_getURL</string>
+                        </tuple>
+                        <tuple>
+                          <string>getOwner</string>
+                          <string>PDFDocument_getURL</string>
+                        </tuple>
+                        <tuple>
+                          <string>creation_date</string>
+                          <string>PDFDocument_getURL</string>
+                        </tuple>
+                        <tuple>
+                          <string>getTranslatedValidationStateTitle</string>
+                          <string>PDFDocument_getURL</string>
+                        </tuple>
+                      </list>
                     </value>
                 </item>
               </dictionary>
@@ -529,7 +564,23 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: \'%s_getAttachedApplicationIncomeList\' % here.getPortalType().replace(\' \', \'\')</string> </value>
+            <value> <string>python: context.Base_translateString("All attached files add to your")+" "+context.Base_translateString(context.getPortalType())</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>method_name</string> </key>
+            <value> <string>PDFDocument_getAttachedApplicationIncomeList</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_outcome.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_outcome.xml
index d0b1457f06..cb522314ae 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_outcome.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_outcome.xml
@@ -201,7 +201,9 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>domain_root_list</string> </key>
@@ -235,6 +237,10 @@
                     <key> <string>hidden</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>hide_rows_on_no_search_criterion</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>lines</string> </key>
                     <value> <string></string> </value>
@@ -245,9 +251,7 @@
                 </item>
                 <item>
                     <key> <string>list_method</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>meta_types</string> </key>
@@ -269,6 +273,10 @@
                     <key> <string>report_tree</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>row_css_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>search</string> </key>
                     <value> <string></string> </value>
@@ -418,17 +426,23 @@
                     <key> <string>hidden</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>hide_rows_on_no_search_criterion</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>lines</string> </key>
                     <value> <int>20</int> </value>
                 </item>
                 <item>
                     <key> <string>list_action</string> </key>
-                    <value> <string>list</string> </value>
+                    <value> <string>Folder_viewContentList</string> </value>
                 </item>
                 <item>
                     <key> <string>list_method</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
                 </item>
                 <item>
                     <key> <string>meta_types</string> </key>
@@ -438,7 +452,7 @@
                 </item>
                 <item>
                     <key> <string>page_template</string> </key>
-                    <value> <string>DeclarationTVA_ListBox_asHTML</string> </value>
+                    <value> <string>EGov_ListBox_asHTML</string> </value>
                 </item>
                 <item>
                     <key> <string>portal_types</string> </key>
@@ -456,6 +470,10 @@
                     <key> <string>report_tree</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>row_css_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>search</string> </key>
                     <value> <int>0</int> </value>
@@ -472,7 +490,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>selection_name_history_view</string> </value>
                 </item>
                 <item>
                     <key> <string>sort</string> </key>
@@ -529,7 +547,23 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: \'%s_getAttachedApplicationOutcomeList\' % here.getPortalType().replace(\' \', \'\')</string> </value>
+            <value> <string>python: context.Base_translateString("All documents resulting of your")+" "+context.Base_translateString(context.getPortalType())</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>method_name</string> </key>
+            <value> <string>PDFDocument_getAttachedApplicationOutcomeList</string> </value>
         </item>
       </dictionary>
     </pickle>
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 c6494483f4..5bcc545955 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
@@ -59,7 +59,7 @@
 portal = context.getPortalObject()\n
 N_ = portal.Base_translateString\n
 website = context.getWebSiteValue()\n
-form_id=\'view\'\n
+form_id=\'EGov_viewLoginForm\'\n
 \n
 REQUEST = context.REQUEST\n
 if REQUEST.has_key(\'portal_skin\'):\n
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/PDFDocument_viewLoginInformationPT.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/PDFDocument_viewLoginInformationPT.xml
index f055d27e0d..607a18f67a 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/PDFDocument_viewLoginInformationPT.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/PDFDocument_viewLoginInformationPT.xml
@@ -57,7 +57,7 @@
 <div class="site_address">\n
   <a href="http://www.erp5.org">http://www.erp5.org</a>\n
 </div>\n
-<tal:bloc tal:condition="python: here.getPortalType() == \'Subscription Form\'">\n
+<tal:bloc tal:condition="python: not here.getTypeInfo().getStepAuthentication()">\n
   <div class="login_and_password">\n
     <tal:bloc i18n:translate="" i18n:domain="ui">\n
       And use the login \n
@@ -66,7 +66,7 @@
     <tal:bloc i18n:translate="" i18n:domain="ui">\n
     and the password \n
     </tal:bloc>\n
-    <span class="password" tal:content="here/getPassword">pin02nuz</span>\n
+    <span class="password" tal:content="python: here.EGov_getAnonymousProcedurePassword()">pin02nuz</span>\n
   </div>\n
 </tal:bloc>\n
 <div class="explanation">\n
diff --git a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterButton.xml b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterButton.xml
index 69f67643ed..bebd4b8d1b 100644
--- a/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterButton.xml
+++ b/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterButton.xml
@@ -47,7 +47,7 @@ Description:\n
 \n
 <tal:block metal:define-macro="main">\n
   <div id="register_button">\n
-    <a href="captcha/CheckCaptcha" i18n:domain="ui" i18n:translate="">Register >></a>\n
+    <a href="captcha/CheckCaptcha/view" i18n:domain="ui" i18n:translate="">Register >></a>\n
   </div>\n
   <div class="clear"></div>\n
 </tal:block>\n
diff --git a/bt5/erp5_egov/bt/change_log b/bt5/erp5_egov/bt/change_log
index 9a9c39d15a..2250919769 100644
--- a/bt5/erp5_egov/bt/change_log
+++ b/bt5/erp5_egov/bt/change_log
@@ -1,3 +1,9 @@
+2010-06-23 mayoro
+* correct redirect url when logout
+* display login and password to track anonymous procedure at the end of submission (it's not only for Subscription Form)
+* remove log in EGov_Base_editAndNextStep
+* configure listbox of PDFDocument_viewAnonymousHistory
+
 2010-06-23 mohamadou
 * change erp5_egov skin priority since some standar script are redefined.
 
diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision
index 4af6ab79ff..316941dd7d 100644
--- a/bt5/erp5_egov/bt/revision
+++ b/bt5/erp5_egov/bt/revision
@@ -1 +1 @@
-598
\ No newline at end of file
+599
\ No newline at end of file
-- 
2.30.9