[Erp5-report] r6805 - /erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Apr 19 15:41:00 CEST 2006
Author: chris
Date: Wed Apr 19 15:40:56 2006
New Revision: 6805
URL: http://svn.erp5.org?rev=6805&view=rev
Log:
- Improved support for diff between 2 old revisions (not perfect but working now)
Added:
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml
Modified:
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml?rev=6805&r1=6804&r2=6805&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml Wed Apr 19 15:40:56 2006
@@ -80,6 +80,8 @@
context.REQUEST.set(\'portal_status_message\', \'You must select only TWO revisions!\')\n
return context.asContext(file=file).BusinessTemplate_viewSvnLog()\n
\n
+revisions_list.sort()\n
+\n
svn_path = context.getPortalObject().portal_preferences.getPreference(\'subversion_working_copy\')\n
if not svn_path :\n
raise "Error: Please set Subversion working path in preferences"\n
@@ -87,11 +89,11 @@
svn_path+=\'/\'\n
file = svn_path + file\n
\n
-print "<b><font color=\'black\'>Index: <a href=\'BusinessTemplate_viewSvnShowFile?file="+file+"\'>"+file+"</a> <a href=\'"+context.getPortalObject()["portal_subversion"].editPath(context, file)+"\'><img src=\'imgs/edit.png\' border=\'0\'></a><br>"\n
-print \'<hr></font></b>\'\n
-print context.getPortalObject()["portal_subversion"].diffHTML(file)\n
-\n
-return printed\n
+diff = "<b><font color=\'black\'>Index: <a href=\'BusinessTemplate_viewSvnShowFile?file="+file+"\'>"+file+"</a> <a href=\'"+context.getPortalObject()["portal_subversion"].editPath(context, file)+"\'><img src=\'imgs/edit.png\' border=\'0\'></a><br>"\n
+diff += \'<hr></b>\'\n
+diff += context.getPortalObject()["portal_subversion"].diffHTML(file, revision1=revisions_list[0], revision2=revisions_list[1])\n
+diff += \'</font>\'\n
+return context.asContext(diff=diff).BusinessTemplate_viewSvnMultiDiff()\n
]]></string> </value>
@@ -135,8 +137,6 @@
<value>
<tuple>
<string>kw</string>
- <string>_print_</string>
- <string>_print</string>
<string>_getitem_</string>
<string>_getattr_</string>
<string>context</string>
@@ -144,6 +144,7 @@
<string>revisions_list</string>
<string>len</string>
<string>svn_path</string>
+ <string>diff</string>
</tuple>
</value>
</item>
Added: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml?rev=6805&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml (added)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnMultiDiff.xml Wed Apr 19 15:40:56 2006
@@ -1,0 +1,86 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.PageTemplates.ZopePageTemplate</string>
+ <string>ZopePageTemplate</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <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_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n
+ "DTD/xhtml1-strict.dtd">\n
+<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>\n
+\n
+<tal:block metal:use-macro="here/view_master/macros/master">\n
+<tal:block metal:fill-slot="main">\n
+\n
+<tal:py replace="structure \n
+here/diff">diff here</tal:py>\n
+<center><button onclick="history.back()" value="Back" name="Back" type="button">Back</button></center>\n
+</tal:block>\n
+</tal:block>\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>content_type</string> </key>
+ <value> <string>text/html</string> </value>
+ </item>
+ <item>
+ <key> <string>expand</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>BusinessTemplate_viewSvnMultiDiff</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
More information about the Erp5-report
mailing list