Commit c494264c authored by Romain Courteaud's avatar Romain Courteaud
parent 50e4b8f0
......@@ -75,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/BusinessTemplate_viewConflicted</string> </value>
<value> <string>string:${object_url}/BusinessTemplate_viewConflictedDialog</string> </value>
</item>
</dictionary>
</pickle>
......
......@@ -75,7 +75,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/BusinessTemplate_viewCreateWorkingCopy</string> </value>
<value> <string>string:${object_url}/BusinessTemplate_viewCreateWorkingCopyDialog</string> </value>
</item>
</dictionary>
</pickle>
......
......@@ -5,8 +5,8 @@ try:
entry_dict = vcs_tool.checkout(context, url)
except SubversionSSLTrustError, error:
context.REQUEST.set('portal_status_message', 'SSL Certificate was not recognized')
return context.asContext(trust_dict = error.getTrustDict(), caller='info').BusinessTemplate_viewSvnSSLTrust()
return context.asContext(trust_dict = error.getTrustDict(), caller='info').BusinessTemplate_viewSvnSSLTrustDialog()
except SubversionLoginError, error1 :
context.REQUEST.set('portal_status_message', 'Server needs authentication, no cookie found')
return context.asContext(caller='info', realm = error1.getRealm(), username = vcs_tool.getPreferredUsername()).BusinessTemplate_viewSvnLogin()
return context.asContext(caller='info', realm = error1.getRealm(), username = vcs_tool.getPreferredUsername()).BusinessTemplate_viewSvnLoginDialog()
return entry_dict
......@@ -37,7 +37,7 @@ if commit_dict['changelog'].strip():
else:
from Products.ERP5Type.Message import translateString
error_msg = "Please set a ChangeLog message."
return context.Base_renderForm('BusinessTemplate_viewVcsChangelog', keep_items={
return context.Base_renderForm('BusinessTemplate_viewVcsChangelogDialog', keep_items={
'portal_status_message': translateString(error_msg),
'cancel_url': context.absolute_url() +
'/BusinessTemplate_viewVcsStatus?do_extract:int=0'
......
......@@ -9,4 +9,4 @@ except ValueError:
business_template = p.portal_catalog.getObject(uid)
return p.REQUEST.RESPONSE.redirect(
business_template.absolute_url_path() + '/BusinessTemplate_viewVcsLog?added=.')
business_template.absolute_url_path() + '/BusinessTemplate_viewVcsLogDialog?added=.')
......@@ -13,7 +13,7 @@ try:
rev2, rev1 = revision_list
except (KeyError, ValueError):
request.set('portal_status_message', 'You must select TWO revisions.')
return context.BusinessTemplate_viewVcsLog()
return context.BusinessTemplate_viewVcsLogDialog()
vcs_tool = context.getVcsTool()
diff = vcs_tool.getHeader(added)
......
......@@ -5,7 +5,7 @@ try:
except NotAWorkingCopyError:
from ZTUtils import make_query
from zExceptions import Redirect
dialog = context.BusinessTemplate_viewCreateWorkingCopy
dialog = context.BusinessTemplate_viewCreateWorkingCopyDialog
context_url = context.absolute_url_path()
query_string = make_query(
cancel_url=context_url,
......
......@@ -7,15 +7,15 @@ try:
except SubversionSSLTrustError, e:
message = 'SSL Certificate was not recognized'
kw = dict(trust_dict=e.getTrustDict())
method = 'BusinessTemplate_viewSvnSSLTrust'
method = 'BusinessTemplate_viewSvnSSLTrustDialog'
except SubversionLoginError, e:
message = 'Server needs authentication, no cookie found'
kw = dict(realm=e.getRealm(), username=context.getVcsTool().getPreferredUsername())
method = 'BusinessTemplate_viewSvnLogin'
method = 'BusinessTemplate_viewSvnLoginDialog'
except GitLoginError, e:
message = str(e)
kw = dict(remote_url=context.getVcsTool().getRemoteUrl())
method = 'BusinessTemplate_viewGitLogin'
method = 'BusinessTemplate_viewGitLoginDialog'
commit_dict['caller'] = caller
# Always propage all information throught formulator hidden field
......
......@@ -8,4 +8,4 @@ else:
message = 'Conflicted files resolved successfully.'
request.set("portal_status_message", message)
return context.BusinessTemplate_viewConflicted()
return context.BusinessTemplate_viewConflictedDialog()
......@@ -80,7 +80,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>BusinessTemplate_viewConflicted</string> </value>
<value> <string>BusinessTemplate_viewConflictedDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......
......@@ -101,7 +101,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>BusinessTemplate_viewCreateWorkingCopy</string> </value>
<value> <string>BusinessTemplate_viewCreateWorkingCopyDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......
......@@ -117,7 +117,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>BusinessTemplate_viewGitLogin</string> </value>
<value> <string>BusinessTemplate_viewGitLoginDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......
......@@ -110,7 +110,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>BusinessTemplate_viewSvnLogin</string> </value>
<value> <string>BusinessTemplate_viewSvnLoginDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......
......@@ -121,7 +121,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>BusinessTemplate_viewSvnSSLTrust</string> </value>
<value> <string>BusinessTemplate_viewSvnSSLTrustDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......
......@@ -98,7 +98,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>BusinessTemplate_viewVcsChangelog</string> </value>
<value> <string>BusinessTemplate_viewVcsChangelogDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......
......@@ -102,7 +102,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>BusinessTemplate_viewVcsLog</string> </value>
<value> <string>BusinessTemplate_viewVcsLogDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......
......@@ -339,7 +339,7 @@ return '''
function log(){
//hide popup
document.getElementById('menudiv').style.display = "none";
open('BusinessTemplate_viewVcsLog?added='+tree.getSelectedItemId(), '_self');
open('BusinessTemplate_viewVcsLogDialog?added='+tree.getSelectedItemId(), '_self');
}
function treeTaller(){
......
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