From 565607bf0fc569111855e6f15f3dc9804288a317 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <christophe@nexedi.com>
Date: Fri, 14 Apr 2006 13:29:43 +0000
Subject: [PATCH] - display alert() if error - display nothing if no changes
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6647 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_skins/erp5_svn/js/dhtmlXCommon.js.xml | 6 +++---
.../portal_skins/erp5_svn/tree.xml.xml | 12 +++++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/js/dhtmlXCommon.js.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/js/dhtmlXCommon.js.xml
index 1835fefc1a..912f5d49da 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/js/dhtmlXCommon.js.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/js/dhtmlXCommon.js.xml
@@ -14,7 +14,7 @@
<dictionary>
<item>
<key> <string>_EtagSupport__etag</string> </key>
- <value> <string>ts45019334.76</string> </value>
+ <value> <string>ts45021272.14</string> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
@@ -64,7 +64,7 @@ function dtmlXMLLoaderObject(funcObject,dhtmlObject,async){\n
if(this.xmlDoc.responseXML){var temp=this.xmlDoc.responseXML.getElementsByTagName(tagName);var z=temp[0];}\n
else var z=this.xmlDoc.documentElement;\n
if(z)return z;\n
- //alert("There are no differences between your business template and the svn repository.");\n
+ alert("Error: execute tree.xml to see debug !");\n
return document.createElement("DIV");\n
};\n
\n
@@ -398,7 +398,7 @@ Node.prototype.removeNode = function(removeChildren)\n
</item>
<item>
<key> <string>size</string> </key>
- <value> <int>10005</int> </value>
+ <value> <int>9962</int> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml
index 4223bf3cbf..57941de895 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml
@@ -66,7 +66,9 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>context.getPortalObject().portal_subversion.extractBT(context)\n
+ <value> <string encoding="cdata"><![CDATA[
+
+context.getPortalObject().portal_subversion.extractBT(context)\n
\n
bt_name = context.getPortalObject()["portal_templates"][context.getId()].getTitle()\n
context.REQUEST.RESPONSE.setHeader(\'Content-Type\', \'text/xml;; charset=utf-8\')\n
@@ -78,9 +80,13 @@ if path[-1] != \'/\':\n
path+=bt_name\n
root = context.getPortalObject().portal_subversion.getModifiedTree(path)\n
if not root:\n
- raise "Erreur: couldn\'t get tree of modified files"\n
+ return \'\'\'<?xml version=\'1.0\' encoding=\'iso-8859-1\'?>\n
+<tree id=\'0\'></tree>\'\'\'\n
+\n
return context.getPortalObject().portal_subversion.treeToXML(root).strip()\n
-</string> </value>
+
+
+]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
--
2.30.9