Skip to content

erp5
erp5
Commit f585ce4c authored by Christophe Dumez's avatar Christophe Dumez
Browse files
Options

Respect Nexedi naming convention (asked by JP) 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6572 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent af94c0cd
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 52 deletions
bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/svn_cleanup_locks.xml
View file @ f585ce4c
......@@ -51,7 +51,9 @@
<item>
<key> <string>permissions</string> </key>
<value>
<tuple/>
<tuple>
<string></string>
</tuple>
</value>
</item>
<item>
......@@ -83,7 +85,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/svn_cleanup</string> </value>
<value> <string>string:${object_url}/BusinessTemplate_doSvnCleanup</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/update_svn_wc.xml
View file @ f585ce4c
......@@ -85,7 +85,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/svn_update</string> </value>
<value> <string>string:${object_url}/BusinessTemplate_doSvnUpdate</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_forge/ActionTemplateItem/portal_types/Business%20Template/view_svn_repos_infos.xml
View file @ f585ce4c
......@@ -51,7 +51,9 @@
<item>
<key> <string>permissions</string> </key>
<value>
<tuple/>
<tuple>
<string></string>
</tuple>
</value>
</item>
<item>
......@@ -83,7 +85,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/svn_info</string> </value>
<value> <string>string:${object_url}/BusinessTemplate_doSvnInfo</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/createJSDiff.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptDiff.xml
View file @ f585ce4c
......@@ -106,7 +106,7 @@ return \'\'\'<script>\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/createJSDiff</string> </value>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptDiff</string> </value>
</item>
<item>
<key> <string>_owner</string> </key>
......@@ -165,7 +165,7 @@ return \'\'\'<script>\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>createJSDiff</string> </value>
<value> <string>BusinessTemplate_doCreateJavaScriptDiff</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/createJSStatus.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptStatus.xml
View file @ f585ce4c
......@@ -181,7 +181,7 @@ print \'\'\'<script>var tree = null;\n
if (nbRemoved==0 && nbAdded==0 && nbModified==0) {\n
alert(\'Nothing to commit !\');\n
} else {\n
submitAction(form,\'%s/svn_commit\');\n
submitAction(form,\'%s/BusinessTemplate_doSvnCommit\');\n
}\n
}\n
\n
......@@ -337,23 +337,21 @@ document.onmousemove = getMouse;\n
} else {\n
if(confirm(\'Are you sure you want to revert changes?\')){\n
form.files.value=to_revert;\n
submitAction(form,\'%s/svn_revert\');\n
//Revert changes\n
//open(\'/svn_revert?files=\'+escape(to_revert), \'_self\');\n
submitAction(form,\'%s/BusinessTemplate_doSvnRevert\');\n
}\n
}\n
}\n
\n
function update(){\n
open(\'%s/svn_update\', \'_self\');\n
open(\'%s/BusinessTemplate_doSvnUpdate\', \'_self\');\n
}\n
\n
function infos(){\n
open(\'%s/svn_info\', \'_self\');\n
open(\'%s/BusinessTemplate_doSvnInfo\', \'_self\');\n
}\n
\n
function cleanup(){\n
open(\'%s/svn_cleanup\', \'_self\');\n
open(\'%s/BusinessTemplate_doSvnCleanup\', \'_self\');\n
}\n
\n
function log(){\n
......@@ -365,7 +363,7 @@ document.onmousemove = getMouse;\n
function ls(){\n
//hide popup\n
document.getElementById(\'menudiv\').style.display = "none";\n
open(\'%s/svn_ls?file=\'+tree.getSelectedItemId(), \'_self\');\n
open(\'%s/BusinessTemplate_doSvnLs?file=\'+tree.getSelectedItemId(), \'_self\');\n
}\n
\n
\'\'\'% (context.getId(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url(), context.absolute_url())\n
......@@ -395,7 +393,7 @@ return printed\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/createJSStatus</string> </value>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doCreateJavaScriptStatus</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -449,7 +447,7 @@ return printed\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>createJSStatus</string> </value>
<value> <string>BusinessTemplate_doCreateJavaScriptStatus</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_cleanup.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml
View file @ f585ce4c
......@@ -80,7 +80,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_cleanup</string> </value>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -129,7 +129,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>svn_cleanup</string> </value>
<value> <string>BusinessTemplate_doSvnCleanup</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
View file @ f585ce4c
......@@ -129,7 +129,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_commit</string> </value>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -201,7 +201,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>svn_commit</string> </value>
<value> <string>BusinessTemplate_doSvnCommit</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_diff.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml
View file @ f585ce4c
......@@ -120,7 +120,7 @@ return printed\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_diff</string> </value>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -180,7 +180,7 @@ return printed\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>svn_diff</string> </value>
<value> <string>BusinessTemplate_doSvnDiff</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_info.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml
View file @ f585ce4c
......@@ -88,7 +88,7 @@ return context.asContext(entry_dict=entry_dict).BusinessTemplate_viewSvnInfos()\
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_info</string> </value>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -143,7 +143,7 @@ return context.asContext(entry_dict=entry_dict).BusinessTemplate_viewSvnInfos()\
</item>
<item>
<key> <string>id</string> </key>
<value> <string>svn_info</string> </value>
<value> <string>BusinessTemplate_doSvnInfo</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_log.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
View file @ f585ce4c
......@@ -108,7 +108,7 @@ return object_list\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_log</string> </value>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnLog</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -174,7 +174,7 @@ return object_list\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>svn_log</string> </value>
<value> <string>BusinessTemplate_doSvnLog</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_login.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.xml
View file @ f585ce4c
......@@ -80,13 +80,13 @@ context.getPortalObject()["portal_subversion"].setLogin(svn_realm, svn_user, svn
if caller == \'update\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_update\')\n
elif caller == \'commit\':\n
return context.asContext(changelog=changelog).svn_commit(added=added,removed=removed,modified=modified)\n
return context.asContext(changelog=changelog).BusinessTemplate_doSvnCommit(added=added,removed=removed,modified=modified)\n
elif caller == \'ls\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_ls?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLs?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
elif caller == \'log\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_log?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLog?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
elif caller == \'info\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_info\')\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnInfo\')\n
else:\n
return \'Error: Caller \'+caller+\' is unknown\'\n
</string> </value>
......@@ -99,7 +99,7 @@ else:\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_login</string> </value>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -157,7 +157,7 @@ else:\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>svn_login</string> </value>
<value> <string>BusinessTemplate_doSvnLogin</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_ls.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml
View file @ f585ce4c
......@@ -96,7 +96,7 @@ else:\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_ls</string> </value>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnLs</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -154,7 +154,7 @@ else:\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>svn_ls</string> </value>
<value> <string>BusinessTemplate_doSvnLs</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml
View file @ f585ce4c
......@@ -93,7 +93,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_revert</string> </value>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -149,7 +149,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>svn_revert</string> </value>
<value> <string>BusinessTemplate_doSvnRevert</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_ssl_trust.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.xml
View file @ f585ce4c
......@@ -82,13 +82,13 @@ context.getPortalObject()["portal_subversion"].acceptSSLServer(trust_dict, True)
if caller == \'update\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_update\')\n
elif caller == \'commit\':\n
return context.asContext(changelog=changelog).svn_commit(added=added,removed=removed,modified=modified)\n
return context.asContext(changelog=changelog).BusinessTemplate_doSvnCommit(added=added,removed=removed,modified=modified)\n
elif caller == \'ls\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_ls?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLs?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
elif caller == \'log\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_log?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLog?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
elif caller == \'info\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/svn_info\')\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnInfo\')\n
else:\n
return \'Error: Caller \'+ caller + \'is unknown\'\n
</string> </value>
......@@ -101,7 +101,7 @@ else:\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_ssl_trust</string> </value>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -162,7 +162,7 @@ else:\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>svn_ssl_trust</string> </value>
<value> <string>BusinessTemplate_doSvnSslTrust</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_update.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml
View file @ f585ce4c
......@@ -96,7 +96,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/svn_update</string> </value>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
......@@ -151,7 +151,7 @@ return context.BusinessTemplate_viewSvnStatus()\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>svn_update</string> </value>
<value> <string>BusinessTemplate_doSvnUpdate</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnChangelog.xml
View file @ f585ce4c
......@@ -47,7 +47,7 @@
</item>
<item>
<key> <string>action</string> </key>
<value> <string>svn_commit</string> </value>
<value> <string>BusinessTemplate_doSvnCommit</string> </value>
</item>
<item>
<key> <string>encoding</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml
View file @ f585ce4c
......@@ -55,9 +55,9 @@
<tal:block metal:use-macro="here/view_master/macros/master">\n
<tal:block metal:fill-slot="main">\n
<tal:js replace="structure \n
here/createJSDiff">JavaScript here</tal:js>\n
here/BusinessTemplate_doCreateJavaScriptDiff">JavaScript here</tal:js>\n
<tal:py replace="structure \n
here/svn_diff">diff here</tal:py>\n
here/BusinessTemplate_doSvnDiff">diff here</tal:py>\n
</tal:block>\n
</tal:block>\n
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml
View file @ f585ce4c
......@@ -561,7 +561,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>svn_log</string> </value>
<value> <string>BusinessTemplate_doSvnLog</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLogin.xml
View file @ f585ce4c
......@@ -47,7 +47,7 @@
</item>
<item>
<key> <string>action</string> </key>
<value> <string>svn_login</string> </value>
<value> <string>BusinessTemplate_doSvnLogin</string> </value>
</item>
<item>
<key> <string>encoding</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnSSLTrust.xml
View file @ f585ce4c
......@@ -47,7 +47,7 @@
</item>
<item>
<key> <string>action</string> </key>
<value> <string>svn_ssl_trust</string> </value>
<value> <string>BusinessTemplate_doSvnSslTrust</string> </value>
</item>
<item>
<key> <string>encoding</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml
View file @ f585ce4c
......@@ -90,7 +90,7 @@
</div>\n
\n
<tal:js replace="structure \n
here/createJSStatus">javascript here</tal:js>\n
here/BusinessTemplate_doCreateJavaScriptStatus">javascript here</tal:js>\n
\n
<font color=\'black\'><h1><center>Subversion</center></h1></font><br>\n
<button onclick="expandCollapse()" value="expand" name="Expand / Collapse" type="button">Expand / Collapse</button>\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