Skip to content

erp5
erp5
Commit 786ec48e authored by Mayoro Diagne's avatar Mayoro Diagne
Browse files
Options

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
parent 8d71db5a
Hide whitespace changes
Inline Side-by-side
Showing with 348 additions and 37 deletions
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_Base_editAndNextStep.xml
View file @ 786ec48e
......@@ -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>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_Base_editAndRedirect.xml
View file @ 786ec48e
......@@ -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>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getAnonymousProcedurePassword.xml 0 → 100644
View file @ 786ec48e
<?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>
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_goToDocument.xml
View file @ 786ec48e
......@@ -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
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml
View file @ 786ec48e
......@@ -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
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox.xml
View file @ 786ec48e
......@@ -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>
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_income.xml
View file @ 786ec48e
......@@ -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>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAnonymousHistory/listbox_application_outcome.xml
View file @ 786ec48e
......@@ -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>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/WebSite_logout.xml
View file @ 786ec48e
......@@ -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
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/PDFDocument_viewLoginInformationPT.xml
View file @ 786ec48e
......@@ -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
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterButton.xml
View file @ 786ec48e
......@@ -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
......
bt5/erp5_egov/bt/change_log
View file @ 786ec48e
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.
......
bt5/erp5_egov/bt/revision
View file @ 786ec48e
598
\ No newline at end of file
599
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7