Commits

Marcin Kuzminski committed f4ff3b5 Draft

fixed selecting quick compare view for tags/bookmarks in pull-request form

  • Participants
  • Parent commits d2d35cf

Comments (0)

Files changed (2)

rhodecode/config/routing.py

                  '/{repo_name:.*?}/compare/{org_ref_type}@{org_ref}...{other_ref_type}@{other_ref}',
                  controller='compare', action='index',
                  conditions=dict(function=check_repo),
-                 requirements=dict(org_ref_type='(branch|book|tag|rev)',
-                                   other_ref_type='(branch|book|tag|rev)'))
+                 requirements=dict(
+                            org_ref_type='(branch|book|tag|rev|org_ref_type)',
+                            other_ref_type='(branch|book|tag|rev|other_ref_type)')
+                 )
 
     rmap.connect('pullrequest_home',
                  '/{repo_name:.*?}/pull-request/new', controller='pullrequests',

rhodecode/templates/pullrequests/pullrequest.html

   var loadPreview = function(){
 	  YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none');
       var url = "${h.url('compare_url',
-          repo_name='org_repo',
-          org_ref_type='branch', org_ref='org_ref',
-          other_ref_type='branch', other_ref='other_ref',
-          repo='other_repo',
-          as_form=True)}";
+    	                 repo_name='org_repo',
+    	                 org_ref_type='org_ref_type', org_ref='org_ref',
+                         other_ref_type='other_ref_type', other_ref='other_ref',
+                         repo='other_repo',
+                         as_form=True)}";
 
       var select_refs = YUQ('#pull_request_form select.refs')