diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml index ad63a10248eab9bcd86ae47a076394ec702f828a..c6a60036987b96c595619af0bb79204c60ea68b4 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml @@ -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 diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml new file mode 100644 index 0000000000000000000000000000000000000000..0331a84292572e8804d91ae7ee7d83426b39ad92 --- /dev/null +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml @@ -0,0 +1,169 @@ +<?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> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml index 328bade7b70c0aba20cb4625450a2f6f57114eb8..9462505044e6f50759c241fbf0fcadbc9772063d 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog.xml @@ -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> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml index e3e34139a62450f1a6843be4d3f4f4ac8eb1dba1..ea1973494c1b75a26e121992dfb7b508150f56c0 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml @@ -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> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/my_file.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/my_file.xml new file mode 100644 index 0000000000000000000000000000000000000000..6e78fd6c90d4051efe955cb774082db39389c330 --- /dev/null +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/my_file.xml @@ -0,0 +1,291 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.StandardFields</string> + <string>StringField</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>my_file</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + <item> + <key> <string>too_long</string> </key> + <value> <string>Too much input was given.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>truncate</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>truncate</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>display_width</string> </key> + <value> <int>20</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>max_length</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string encoding="cdata"><![CDATA[ + + + +]]></string> </value> + </item> + <item> + <key> <string>truncate</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>here/REQUEST/file</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml index 3143a690926f8250b17606e661633cbe59a3befb..5c49b38bb66966361ac78f70ab3b1d0a4384ded8 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml @@ -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> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_subversion_working_copy.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy.xml similarity index 99% rename from bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_subversion_working_copy.xml rename to bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy.xml index 6345ff310c17b623d754b2599687d82bfd7cc9c4..b54eaad63c30ea7c67277cff3999fbe2f221ebf6 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_subversion_working_copy.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy.xml @@ -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>