Skip to content

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

- fixed a bug in file history when no ssl trust / login cookie found. Was... 

- fixed a bug in file history when no ssl trust / login cookie found. Was executed in background and user was never prompted for ssl trust / login.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7151 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9b05ea2b
Show whitespace changes
Inline Side-by-side
Showing with 156 additions and 11 deletions
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_LogListMethod.xml 0 → 100644
View file @ bd65567c
<?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>return context.REQUEST[\'object_list\']\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_LogListMethod</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>_getitem_</string>
<string>_getattr_</string>
<string>context</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_LogListMethod</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_doCreateJavaScriptStatus.xml
View file @ bd65567c
......@@ -361,7 +361,8 @@ print \'\'\'\n
function log(){\n
//hide popup\n
document.getElementById(\'menudiv\').style.display = "none";\n
open(\'%s/BusinessTemplate_viewSvnLog?file=\'+tree.getSelectedItemId(), \'_self\');\n
open(\'%s/BusinessTemplate_doSvnLog?file=\'+tree.getSelectedItemId(), \'_self\');\n
//open(\'/BusinessTemplate_viewSvnLog?file=\'+tree.getSelectedItemId(), \'_self\');\n
}\n
\n
function ls(){\n
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
View file @ bd65567c
......@@ -75,10 +75,10 @@ try:\n
log_list = context.getPortalObject()["portal_subversion"].log(file, context)\n
except SubversionSSLTrustError, error:\n
context.REQUEST.set(\'portal_status_message\', \'SSL Certificate was not recognized\')\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'log\').BusinessTemplate_viewSvnSSLTrust()\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'log\', file=file).BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n
return context.asContext(caller=\'log\', realm = error1.getRealm(), username = context.getPortalObject().portal_preferences.getPreference(\'preferred_subversion_user_name\')).BusinessTemplate_viewSvnLogin()\n
return context.asContext(caller=\'log\', file=file, realm = error1.getRealm(), username = context.getPortalObject().portal_preferences.getPreference(\'preferred_subversion_user_name\')).BusinessTemplate_viewSvnLogin()\n
\n
if not log_list:\n
return []\n
......@@ -91,7 +91,12 @@ for my_dict in log_list:\n
temp_object.edit(**my_dict)\n
object_list.append(temp_object)\n
\n
return object_list\n
#return object_list\n
context.REQUEST.set(\'object_list\', object_list)\n
return context.BusinessTemplate_viewSvnLog()\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url()+\'/BusinessTemplate_viewSvnLog\')\n
return context.asContext(object_list=object_list).BusinessTemplate_viewSvnLog() # Working "here.object_list"\n
#return context.BusinessTemplate_viewSvnLog()\n
]]></string> </value>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLogin.xml
View file @ bd65567c
......@@ -84,7 +84,7 @@ elif caller == \'commit\':\n
elif caller == \'ls\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLs?file=\'+context.REQUEST[\'file\'].replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
elif caller == \'log\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLog?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLog?file=\'+context.REQUEST[\'file\'].replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
elif caller == \'info\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnInfo\')\n
else:\n
......@@ -141,7 +141,6 @@ else:\n
<string>removed</string>
<string>caller</string>
<string>changelog</string>
<string>files</string>
</tuple>
</value>
</item>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnSslTrust.xml
View file @ bd65567c
......@@ -86,7 +86,7 @@ elif caller == \'commit\':\n
elif caller == \'ls\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLs?file=\'+context.REQUEST[\'file\'].replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
elif caller == \'log\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLog?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLog?file=\'+context.REQUEST[\'file\'].replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\n
elif caller == \'info\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnInfo\')\n
else:\n
......@@ -146,7 +146,6 @@ else:\n
<string>key</string>
<string>_write_</string>
<string>True</string>
<string>files</string>
</tuple>
</value>
</item>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/listbox.xml
View file @ bd65567c
......@@ -427,7 +427,7 @@
</item>
<item>
<key> <string>list_action</string> </key>
<value> <string>BusinessTemplate_viewSvnLog</string> </value>
<value> <string>manage_main</string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
......@@ -561,7 +561,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>BusinessTemplate_doSvnLog</string> </value>
<value> <string>BusinessTemplate_LogListMethod</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnLog/my_file.xml
View file @ bd65567c
......@@ -283,7 +283,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>here/REQUEST/file</string> </value>
<value> <string>python:here.REQUEST[\'file\']</string> </value>
</item>
</dictionary>
</pickle>
......
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