Commit 7b9a090c authored by Christophe Dumez's avatar Christophe Dumez

fixed files info when no ssltrust/login cookies

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7141 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 1f1c9461
......@@ -82,7 +82,7 @@ if caller == \'update\':\n
elif caller == \'commit\':\n
return context.BusinessTemplate_doSvnCommit(changelog=changelog,added=added,removed=removed,modified=modified)\n
elif caller == \'ls\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLs?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\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
elif caller == \'info\':\n
......
......@@ -72,10 +72,10 @@ try:\n
infos_list = context.getPortalObject()["portal_subversion"].ls(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=\'ls\').BusinessTemplate_viewSvnSSLTrust()\n
return context.asContext(trust_dict = error.getTrustDict(), file=file, caller=\'ls\').BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n
return context.asContext(caller=\'ls\', realm = error1.getRealm(), username = context.getPortalObject().portal_preferences.getPreference(\'preferred_subversion_user_name\')).BusinessTemplate_viewSvnLogin()\n
return context.asContext(caller=\'ls\', file=file, realm = error1.getRealm(), username = context.getPortalObject().portal_preferences.getPreference(\'preferred_subversion_user_name\')).BusinessTemplate_viewSvnLogin()\n
if infos_list:\n
return context.asContext(infos_dict=infos_list[0], file=file, edit_path=context.getPortalObject()["portal_subversion"].editPath(context, file)).BusinessTemplate_viewSvnInfosFile()\n
else:\n
......
......@@ -84,7 +84,7 @@ if caller == \'update\':\n
elif caller == \'commit\':\n
return context.BusinessTemplate_doSvnCommit(changelog=changelog,added=added,removed=removed,modified=modified)\n
elif caller == \'ls\':\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_doSvnLs?file=\'+files.replace(\'%20\',\'%2520\').replace(\' \',\'%20\'))\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
elif caller == \'info\':\n
......
......@@ -115,7 +115,7 @@
</item>
<item>
<key> <string>name</string> </key>
<value> <string>BusinessTemplate_viewSvnLog2</string> </value>
<value> <string>BusinessTemplate_viewSvnLog</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
......
......@@ -427,7 +427,7 @@
</item>
<item>
<key> <string>list_action</string> </key>
<value> <string>manage_main</string> </value>
<value> <string>BusinessTemplate_viewSvnLog</string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
......
......@@ -90,6 +90,7 @@
<string>my_user</string>
<string>my_password</string>
<string>my_caller</string>
<string>my_file</string>
</list>
</value>
</item>
......
......@@ -81,6 +81,7 @@
<string>my_valid_from</string>
<string>my_issuer_name</string>
<string>my_failures</string>
<string>my_file</string>
</list>
</value>
</item>
......
......@@ -76,7 +76,6 @@
<input type=\'hidden\' name=\'modified\' value=\'\'>\n
<input type=\'hidden\' name=\'files\' value=\'\'>\n
<!-- End Hidden -->\n
\n
<div id="menudiv" style="position:absolute; display:none; top:0px; left:0px;z-index:10000;" onmouseover="javascript:overpopupmenu=true;" onmouseout="javascript:overpopupmenu=false;">\n
<table width=82 cellspacing=1 cellpadding=0 bgcolor=lightgray>\n
<tr><td>\n
......
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