##// END OF EJS Templates
fixed selecting quick compare view for tags/bookmarks in pull-request form
marcink -
r2710:f4ff3b5b beta
parent child Browse files
Show More
@@ -435,8 +435,10 b' def make_map(config):'
435 '/{repo_name:.*?}/compare/{org_ref_type}@{org_ref}...{other_ref_type}@{other_ref}',
435 '/{repo_name:.*?}/compare/{org_ref_type}@{org_ref}...{other_ref_type}@{other_ref}',
436 controller='compare', action='index',
436 controller='compare', action='index',
437 conditions=dict(function=check_repo),
437 conditions=dict(function=check_repo),
438 requirements=dict(org_ref_type='(branch|book|tag|rev)',
438 requirements=dict(
439 other_ref_type='(branch|book|tag|rev)'))
439 org_ref_type='(branch|book|tag|rev|org_ref_type)',
440 other_ref_type='(branch|book|tag|rev|other_ref_type)')
441 )
440
442
441 rmap.connect('pullrequest_home',
443 rmap.connect('pullrequest_home',
442 '/{repo_name:.*?}/pull-request/new', controller='pullrequests',
444 '/{repo_name:.*?}/pull-request/new', controller='pullrequests',
@@ -138,11 +138,11 b''
138 var loadPreview = function(){
138 var loadPreview = function(){
139 YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none');
139 YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none');
140 var url = "${h.url('compare_url',
140 var url = "${h.url('compare_url',
141 repo_name='org_repo',
141 repo_name='org_repo',
142 org_ref_type='branch', org_ref='org_ref',
142 org_ref_type='org_ref_type', org_ref='org_ref',
143 other_ref_type='branch', other_ref='other_ref',
143 other_ref_type='other_ref_type', other_ref='other_ref',
144 repo='other_repo',
144 repo='other_repo',
145 as_form=True)}";
145 as_form=True)}";
146
146
147 var select_refs = YUQ('#pull_request_form select.refs')
147 var select_refs = YUQ('#pull_request_form select.refs')
148
148
General Comments 0
You need to be logged in to leave comments. Login now