Skip to content

erp5
erp5
Commit 5a5ffcaa authored by Vincent Pelletier's avatar Vincent Pelletier
Browse files
Options

Revert update_action to update_method (as it was named in html style) because... 

Revert update_action to update_method (as it was named in html style) because it's consistent with dialog_method.
The patch to set the title was bad, this one factorize the code.
Divert Base_showUpdateDialog from erp5_core.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9773 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 203a4fa4
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 25 deletions
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_showUpdateDialog.xml 0 → 100644
View file @ 5a5ffcaa
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.PythonScripts.PythonScript</string>
<string>PythonScript</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</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>kw.update(context.REQUEST.form)\n
kw[\'dialog_method\'] = update_method\n
return context.Base_callDialogMethod(**kw) #XXX: is enable_pickle=1 required ?\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>update_method, **kw</string> </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>1</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>update_method</string>
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
<string>_write_</string>
<string>_apply_</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>Base_showUpdateDialog</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/ERP5XhtmlStyle_filterParameterList.xml
View file @ 5a5ffcaa
...@@ -90,7 +90,7 @@ if parameter_list.has_key(\'-C\'):\n ...@@ -90,7 +90,7 @@ if parameter_list.has_key(\'-C\'):\n
\n \n
# erp5_xhtml_style special fields.\n # erp5_xhtml_style special fields.\n
# This is normal.\n # This is normal.\n
for k in (\'came_from\', \'SearchableText\', \'workflow_action\', \'portal_status_message\', \'reset\', \'dialog_id\', \'update_action\', \'dialog_method\', \'cancel_method\'):\n for k in (\'came_from\', \'SearchableText\', \'workflow_action\', \'portal_status_message\', \'reset\', \'dialog_id\', \'update_method\', \'dialog_method\', \'cancel_method\'):\n
if parameter_list.has_key(k):\n if parameter_list.has_key(k):\n
del parameter_list[k]\n del parameter_list[k]\n
\n \n
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
View file @ 5a5ffcaa
...@@ -80,8 +80,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -80,8 +80,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
global dialog_category request/dialog_category | nothing;\n global dialog_category request/dialog_category | nothing;\n
\n \n
local_parameter_list local_parameter_list | python: {};\n local_parameter_list local_parameter_list | python: {};\n
dummy python: local_parameter_list.update({\'dialog_id\': dialog_id, \'dialog_method\': dialog_method, \'update_action\': update_action, \'dialog_category\': dialog_category});\n dummy python: local_parameter_list.update({\'dialog_id\': dialog_id, \'dialog_method\': dialog_method, \'update_method\': update_action, \'dialog_category\': dialog_category});\n
">\n title form/title">\n
<tal:block metal:use-macro="here/main_template/macros/master">\n <tal:block metal:use-macro="here/main_template/macros/master">\n
<tal:block metal:fill-slot="main">\n <tal:block metal:fill-slot="main">\n
<div class="list_dialog">\n <div class="list_dialog">\n
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view.xml
View file @ 5a5ffcaa
...@@ -73,11 +73,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -73,11 +73,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n -->\n
</tal:block>\n </tal:block>\n
<tal:block metal:define-macro="master">\n <tal:block metal:define-macro="master">\n
<tal:block tal:define="title string:${template/title_or_id} - ${here/Title}">\n <tal:block metal:use-macro="here/view_main/macros/master">\n
<tal:block metal:use-macro="here/view_main/macros/master">\n <tal:block metal:fill-slot="main">\n
<tal:block metal:fill-slot="main">\n <tal:block metal:use-macro="here/form_render/macros/master" />\n
<tal:block metal:use-macro="here/form_render/macros/master" />\n
</tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block> </tal:block>
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/list_main.xml
View file @ 5a5ffcaa
...@@ -83,7 +83,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -83,7 +83,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
\n \n
local_parameter_list local_parameter_list | python: {};\n local_parameter_list local_parameter_list | python: {};\n
dummy python: local_parameter_list.update({\'selection_name\': selection_name, \'selection_index\': selection_index, \'form_id\': form_id});\n dummy python: local_parameter_list.update({\'selection_name\': selection_name, \'selection_index\': selection_index, \'form_id\': form_id});\n
">\n title string:${here/Title}">\n
<tal:block metal:use-macro="here/main_template/macros/master">\n <tal:block metal:use-macro="here/main_template/macros/master">\n
<tal:block metal:fill-slot="context_bar">\n <tal:block metal:fill-slot="context_bar">\n
<tal:block metal:use-macro="here/context_box_render/macros/master" />\n <tal:block metal:use-macro="here/context_box_render/macros/master" />\n
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/quad_form_view.xml
View file @ 5a5ffcaa
...@@ -72,7 +72,6 @@ along with this program; if not, write to the Free Software\n ...@@ -72,7 +72,6 @@ along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n -->\n
</tal:block>\n </tal:block>\n
<tal:block tal:define="title string:${template/title_or_id} - ${here/Title}">\n
<tal:block metal:use-macro="here/view_main/macros/master">\n <tal:block metal:use-macro="here/view_main/macros/master">\n
<tal:block metal:fill-slot="main">\n <tal:block metal:fill-slot="main">\n
<tal:block tal:define="field_errors python: request.get(\'field_errors\',{});\n <tal:block tal:define="field_errors python: request.get(\'field_errors\',{});\n
...@@ -126,7 +125,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -126,7 +125,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
</div>\n </div>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block>\n
</tal:block> </tal:block>
]]></string> </value> ]]></string> </value>
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/report_view.xml
View file @ 5a5ffcaa
...@@ -73,23 +73,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -73,23 +73,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n -->\n
</tal:block>\n </tal:block>\n
<tal:block tal:define="title string:${template/title_or_id} - ${here/Title}">\n <tal:block tal:define="title string:${template/title_or_id} - ${here/Title}">\n
<tal:block metal:use-macro="here/view_main/macros/master">\n <tal:block metal:use-macro="here/view_main/macros/master">\n
<tal:block metal:fill-slot="main">\n <tal:block metal:fill-slot="main">\n
<tal:block tal:define="portal_object here/getPortalObject">\n <tal:block tal:define="portal_object here/getPortalObject">\n
<tal:block tal:repeat="report_item report_method">\n <tal:block tal:repeat="report_item report_method">\n
<tal:block tal:define="here python: report_item.getObject(portal_object);\n <tal:block tal:define="here python: report_item.getObject(portal_object);\n
dummy python: report_item.pushReport(portal_object)">\n dummy python: report_item.pushReport(portal_object)">\n
<tal:block tal:condition="report_item/getFormId">\n <tal:block tal:condition="report_item/getFormId">\n
<tal:block tal:define="form python:getattr(here,report_item.getFormId())" >\n <tal:block tal:define="form python:getattr(here,report_item.getFormId())" >\n
<tal:block metal:use-macro="here/form_render/macros/master" />\n <tal:block metal:use-macro="here/form_render/macros/master" />\n
</tal:block>\n
</tal:block>\n </tal:block>\n
<tal:block tal:define="dummy python:report_item.popReport(portal_object)" />\n
</tal:block>\n </tal:block>\n
<tal:block tal:define="dummy python:report_item.popReport(portal_object)" />\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block>\n
</tal:block> </tal:block>
]]></string> </value> ]]></string> </value>
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
View file @ 5a5ffcaa
...@@ -88,8 +88,7 @@ IDEAS:\n ...@@ -88,8 +88,7 @@ IDEAS:\n
<base tal:attributes="href python: \'%s/\' % (url, )"/>\n <base tal:attributes="href python: \'%s/\' % (url, )"/>\n
<meta name="generator" content="ERP5"/>\n <meta name="generator" content="ERP5"/>\n
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\n
<title tal:condition="title | nothing" tal:content="title"/>\n <title tal:content="title | string:ERP5"/>\n
<title tal:condition="not:title | nothing" tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui"></title>\n
<tal:block tal:repeat="css css_list">\n <tal:block tal:repeat="css css_list">\n
<link tal:attributes="href css" type="text/css" rel="stylesheet"/>\n <link tal:attributes="href css" type="text/css" rel="stylesheet"/>\n
</tal:block>\n </tal:block>\n
......
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/view_main.xml
View file @ 5a5ffcaa
...@@ -72,7 +72,6 @@ along with this program; if not, write to the Free Software\n ...@@ -72,7 +72,6 @@ along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n -->\n
</tal:block>\n </tal:block>\n
\n
<tal:block metal:define-macro="master">\n <tal:block metal:define-macro="master">\n
<tal:block\n <tal:block\n
tal:define="object_uid here/getUid | nothing;\n tal:define="object_uid here/getUid | nothing;\n
...@@ -82,6 +81,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -82,6 +81,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
form_action python: form and form.action not in (\'\', None) and here.portal_membership.checkPermission(\'Modify portal content\', here) and form.action or nothing;\n form_action python: form and form.action not in (\'\', None) and here.portal_membership.checkPermission(\'Modify portal content\', here) and form.action or nothing;\n
local_parameter_list local_parameter_list | python: {};\n local_parameter_list local_parameter_list | python: {};\n
dummy python: local_parameter_list.update({\'object_uid\': object_uid, \'object_path\': object_path, \'form_id\': form_id});\n dummy python: local_parameter_list.update({\'object_uid\': object_uid, \'object_path\': object_path, \'form_id\': form_id});\n
title string:${template/title_or_id} - ${here/Title};\n
">\n ">\n
<tal:block metal:use-macro="here/main_template/macros/master">\n <tal:block metal:use-macro="here/main_template/macros/master">\n
<tal:block metal:fill-slot="context_bar">\n <tal:block metal:fill-slot="context_bar">\n
......
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