Skip to content

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

- started work on diff between two old revisions 

- renamed working copy preference

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6790 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 79f5173f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 469 additions and 7 deletions
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
View file @ 53456eee
......@@ -91,6 +91,7 @@ if not log_list:\n
object_list = []\n
for my_dict in log_list:\n
my_dict[\'message\']=\'<br>\'.join(my_dict[\'message\'].split(\'\\n\'))\n
my_dict[\'uid\']=my_dict[\'revision\']\n
temp_object = newTempBase(folder=context.getPortalObject(), id=\'1234\')\n
temp_object.edit(**my_dict)\n
object_list.append(temp_object)\n
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml 0 → 100644
View file @ 53456eee
<?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> <string encoding="base64">bfINCg==</string> </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 encoding="cdata"><![CDATA[
revisions_list = context.REQUEST[\'uids\']\n
file = context.REQUEST[\'file\']\n
\n
if len(revisions_list) != 2:\n
context.REQUEST.set(\'portal_status_message\', \'You must select only TWO revisions!\')\n
return context.asContext(file=file).BusinessTemplate_viewSvnLog()\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
if svn_path[-1]!=\'/\':\n
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
]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value> <string>Script (Python):/erp5/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>**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>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>kw</string>
<string>_print_</string>
<string>_print</string>
<string>_getitem_</string>
<string>_getattr_</string>
<string>context</string>
<string>revisions_list</string>
<string>file</string>
<string>len</string>
<string>svn_path</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>BusinessTemplate_doSvnMultiDiff</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml
View file @ 53456eee
......@@ -47,7 +47,7 @@
</item>
<item>
<key> <string>action</string> </key>
<value> <string></string> </value>
<value> <string>BusinessTemplate_doSvnMultiDiff</string> </value>
</item>
<item>
<key> <string>encoding</string> </key>
......@@ -98,6 +98,7 @@
<value>
<list>
<string>my_title</string>
<string>my_file</string>
</list>
</value>
</item>
......@@ -130,7 +131,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
<value> <string>View Diff between revisions</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml
View file @ 53456eee
......@@ -486,11 +486,11 @@
</item>
<item>
<key> <string>select</string> </key>
<value> <int>0</int> </value>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
<value> <string>business_template_view_svn_log_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml
View file @ 53456eee
......@@ -70,11 +70,11 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>Default</string> </key>
<value>
<list>
<string>my_preferred_subversion_user_name</string>
<string>my_subversion_working_copy</string>
<string>my_preferred_subversion_working_copy</string>
</list>
</value>
</item>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_subversion_working_copy.xml → bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy.xml
View file @ 53456eee
......@@ -14,7 +14,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>my_subversion_working_copy</string> </value>
<value> <string>my_preferred_subversion_working_copy</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......
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