Commit 6fdf6666 authored by Christophe Dumez's avatar Christophe Dumez

- get current zope username if preferred username is not already set in...

- get current zope username if preferred username is not already set in portal_preferences (asked by Yoshinori)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7348 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 386931ce
...@@ -106,7 +106,7 @@ except SubversionSSLTrustError, error:\n ...@@ -106,7 +106,7 @@ except SubversionSSLTrustError, error:\n
return context.asContext(added=added, modified=modified, removed=removed, trust_dict = error.getTrustDict(), caller=\'commit\', changelog=changelog).BusinessTemplate_viewSvnSSLTrust()\n return context.asContext(added=added, modified=modified, removed=removed, trust_dict = error.getTrustDict(), caller=\'commit\', changelog=changelog).BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n
return context.asContext(added=added, modified=modified, removed=removed, caller=\'commit\', realm = error1.getRealm(), changelog=changelog, username = context.getPortalObject().portal_preferences.getPreference(\'preferred_subversion_user_name\')).BusinessTemplate_viewSvnLogin()\n return context.asContext(added=added, modified=modified, removed=removed, caller=\'commit\', realm = error1.getRealm(), changelog=changelog, username = context.getPortalObject()["portal_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
\n \n
context.REQUEST.set(\'portal_status_message\', \'Files commited successfully.\')\n context.REQUEST.set(\'portal_status_message\', \'Files commited successfully.\')\n
return context.BusinessTemplate_viewSvnStatus()\n return context.BusinessTemplate_viewSvnStatus()\n
......
...@@ -75,7 +75,7 @@ except SubversionSSLTrustError, error:\n ...@@ -75,7 +75,7 @@ except SubversionSSLTrustError, error:\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'info\').BusinessTemplate_viewSvnSSLTrust()\n return context.asContext(trust_dict = error.getTrustDict(), caller=\'info\').BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n
return context.asContext(caller=\'info\', realm = error1.getRealm(), username = context.getPortalObject().portal_preferences.getPreference(\'preferred_subversion_user_name\')).BusinessTemplate_viewSvnLogin()\n return context.asContext(caller=\'info\', realm = error1.getRealm(), username = context.getPortalObject()["portal_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
\n \n
return context.asContext(entry_dict=entry_dict).BusinessTemplate_viewSvnInfos()\n return context.asContext(entry_dict=entry_dict).BusinessTemplate_viewSvnInfos()\n
</string> </value> </string> </value>
......
...@@ -77,7 +77,7 @@ except SubversionSSLTrustError, error:\n ...@@ -77,7 +77,7 @@ except SubversionSSLTrustError, error:\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'log\').BusinessTemplate_viewSvnSSLTrust()\n return context.asContext(trust_dict = error.getTrustDict(), caller=\'log\').BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\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\', realm = error1.getRealm(), username = context.getPortalObject()["portal_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
\n \n
if not conflicted_list:\n if not conflicted_list:\n
return []\n return []\n
......
...@@ -77,7 +77,7 @@ except SubversionSSLTrustError, error:\n ...@@ -77,7 +77,7 @@ except SubversionSSLTrustError, error:\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'log\').BusinessTemplate_viewSvnSSLTrust()\n return context.asContext(trust_dict = error.getTrustDict(), caller=\'log\').BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\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\', realm = error1.getRealm(), username = context.getPortalObject()["portal_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
\n \n
if not unversioned_list:\n if not unversioned_list:\n
return []\n return []\n
......
...@@ -78,7 +78,7 @@ except SubversionSSLTrustError, error:\n ...@@ -78,7 +78,7 @@ except SubversionSSLTrustError, error:\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'log\', file=file).BusinessTemplate_viewSvnSSLTrust()\n return context.asContext(trust_dict = error.getTrustDict(), caller=\'log\', file=file).BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n
return context.asContext(caller=\'log\', file=file, 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_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
\n \n
if not log_list:\n if not log_list:\n
return []\n return []\n
......
...@@ -89,7 +89,7 @@ except SubversionSSLTrustError, error:\n ...@@ -89,7 +89,7 @@ except SubversionSSLTrustError, error:\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'log\', file=file).BusinessTemplate_viewSvnSSLTrust()\n return context.asContext(trust_dict = error.getTrustDict(), caller=\'log\', file=file).BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n
return context.asContext(caller=\'log\', file=file, 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_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
\n \n
if not log_list:\n if not log_list:\n
return []\n return []\n
......
...@@ -75,7 +75,7 @@ except SubversionSSLTrustError, error:\n ...@@ -75,7 +75,7 @@ except SubversionSSLTrustError, error:\n
return context.asContext(trust_dict = error.getTrustDict(), file=file, caller=\'ls\').BusinessTemplate_viewSvnSSLTrust()\n return context.asContext(trust_dict = error.getTrustDict(), file=file, caller=\'ls\').BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n
return context.asContext(caller=\'ls\', file=file, 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_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
if infos_list:\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 return context.asContext(infos_dict=infos_list[0], file=file, edit_path=context.getPortalObject()["portal_subversion"].editPath(context, file)).BusinessTemplate_viewSvnInfosFile()\n
else:\n else:\n
......
...@@ -88,7 +88,7 @@ except SubversionSSLTrustError, error:\n ...@@ -88,7 +88,7 @@ except SubversionSSLTrustError, error:\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'switch\',repos_url=repos_url).BusinessTemplate_viewSvnSSLTrust()\n return context.asContext(trust_dict = error.getTrustDict(), caller=\'switch\',repos_url=repos_url).BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n
return context.asContext(caller=\'switch\', realm = error1.getRealm(), repos_url=repos_url, username = context.getPortalObject().portal_preferences.getPreference(\'preferred_subversion_user_name\')).BusinessTemplate_viewSvnLogin()\n return context.asContext(caller=\'switch\', realm = error1.getRealm(), repos_url=repos_url, username = context.getPortalObject()["portal_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
\n \n
context.REQUEST.set(\'portal_status_message\', \'Subversion Repository switched successfully.\')\n context.REQUEST.set(\'portal_status_message\', \'Subversion Repository switched successfully.\')\n
return context.BusinessTemplate_viewSvnStatus()\n return context.BusinessTemplate_viewSvnStatus()\n
......
...@@ -77,7 +77,7 @@ except SubversionSSLTrustError, error:\n ...@@ -77,7 +77,7 @@ except SubversionSSLTrustError, error:\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'update\').BusinessTemplate_viewSvnSSLTrust()\n return context.asContext(trust_dict = error.getTrustDict(), caller=\'update\').BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n
return context.asContext(caller=\'update\', realm = error1.getRealm(), username = context.getPortalObject().portal_preferences.getPreference(\'preferred_subversion_user_name\')).BusinessTemplate_viewSvnLogin()\n return context.asContext(caller=\'update\', realm = error1.getRealm(), username = context.getPortalObject()["portal_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
\n \n
context.REQUEST.set(\'portal_status_message\', \'Working Copy updated successfully.\')\n context.REQUEST.set(\'portal_status_message\', \'Working Copy updated successfully.\')\n
return new_bt.REQUEST.RESPONSE.redirect(new_bt.REQUEST[\'BASE3\']+\'/\'+new_bt.getId()+\'/\'+\'BusinessTemplate_viewInstallationDialog?workflow_action=install_action&form_id=\'+context.getId())\n return new_bt.REQUEST.RESPONSE.redirect(new_bt.REQUEST[\'BASE3\']+\'/\'+new_bt.getId()+\'/\'+\'BusinessTemplate_viewInstallationDialog?workflow_action=install_action&form_id=\'+context.getId())\n
......
...@@ -75,7 +75,7 @@ except SubversionSSLTrustError, error:\n ...@@ -75,7 +75,7 @@ except SubversionSSLTrustError, error:\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'updatewc\').BusinessTemplate_viewSvnSSLTrust()\n return context.asContext(trust_dict = error.getTrustDict(), caller=\'updatewc\').BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n
return context.asContext(caller=\'updatewc\', realm = error1.getRealm(), username = context.getPortalObject().portal_preferences.getPreference(\'preferred_subversion_user_name\')).BusinessTemplate_viewSvnLogin()\n return context.asContext(caller=\'updatewc\', realm = error1.getRealm(), username = context.getPortalObject()["portal_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
\n \n
context.REQUEST.set(\'portal_status_message\', \'Working Copy updated successfully.\')\n context.REQUEST.set(\'portal_status_message\', \'Working Copy updated successfully.\')\n
return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_viewSvnStatus\')\n return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_viewSvnStatus\')\n
......
2006-05-18 chris 2006-05-18 chris
* fixed some bugs in sslTrust / login * fixed some bugs in sslTrust / login
* added action to update local working copy * added action to update local working copy
* get current zope username if preferred username is not set
2006-05-17 chris 2006-05-17 chris
* added search engine for orphan objects : Base_viewOrphanObjects * added search engine for orphan objects : Base_viewOrphanObjects
......
0.7.1 0.7.2
\ No newline at end of file \ No newline at end of file
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