Commit 4d967971 authored by Christophe Dumez's avatar Christophe Dumez

- fixed commit in diff

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6659 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 32a6ef42
......@@ -68,32 +68,19 @@
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
modified=context.REQUEST["modified"]\n
filesToCommit=[]\n
if(modified!=\'none\'):\n
filesToCommit+=modified.split(\',\')\n
added=context.REQUEST["added"]\n
if(added!=\'none\'):\n
filesToCommit+=added.split(\',\')\n
removed=context.REQUEST["removed"]\n
if(removed!=\'none\'):\n
filesToCommit+=removed.split(\',\')\n
\n
filesToCommit=\',\'.join(filesToCommit)\n
\n
return \'\'\'<script>\n
\n
function doCommit(){\n
function doCommit(form){\n
if(confirm(\'Are you sure you want to commit?\')){\n
//Commit Files\n
open(\'%s/BusinessTemplate_doSvnCommit?files=\'+escape(\\\'%s\\\'), \'_self\');\n
submitAction(form,\'%s/BusinessTemplate_doSvnCommit\');\n
}\n
}\n
\n
function goBack(){\n
open(\'%s/BusinessTemplate_viewSvnStatus?files=\'+escape(\\\'%s\\\'), \'_self\');\n
open(\'%s/BusinessTemplate_viewSvnStatus\', \'_self\');\n
} \n
</script>\'\'\'% (context.absolute_url(), filesToCommit, context.absolute_url(), filesToCommit)\n
</script>\'\'\'% (context.absolute_url(), context.absolute_url())\n
]]></string> </value>
......@@ -142,13 +129,8 @@ return \'\'\'<script>\n
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>_getitem_</string>
<string>_getattr_</string>
<string>context</string>
<string>modified</string>
<string>filesToCommit</string>
<string>added</string>
<string>removed</string>
</tuple>
</value>
</item>
......
......@@ -55,16 +55,16 @@
<tal:block metal:use-macro="here/view_master/macros/master">\n
<tal:block metal:fill-slot="main">\n
<!-- Form Hidden : Selected files -->\n
<input type=\'hidden\' name=\'removed\' value=\'\'>\n
<input type=\'hidden\' name=\'added\' value=\'\'>\n
<input type=\'hidden\' name=\'modified\' value=\'\'>\n
<input type=\'hidden\' name=\'removed\' tal:attributes="value python:context.REQUEST[\'removed\']">\n
<input type=\'hidden\' name=\'added\' tal:attributes="value python:context.REQUEST[\'added\']">\n
<input type=\'hidden\' name=\'modified\' tal:attributes="value python:context.REQUEST[\'modified\']">\n
<!-- End Hidden -->\n
<tal:js replace="structure \n
here/BusinessTemplate_doCreateJavaScriptDiff">JavaScript here</tal:js>\n
<tal:py replace="structure \n
here/BusinessTemplate_doSvnDiff">diff here</tal:py>\n
<center><button onclick="history.back()" value="Back" name="Back" type="button">Back</button>\n
<button onclick="doCommit()" value="commit" name="commit Changes" type="button">Commit Changes</button></center>\n
<button onclick="doCommit(this.form)" value="commit" name="commit Changes" type="button">Commit Changes</button></center>\n
</tal:block>\n
</tal:block>\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