kallithea Changeset - a91fa221a3b8

Changeset - a91fa221a3b8

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-02-04 21:26:01
marcin@python-works.com

be more explicit about constructing compare url

2 files changed with 24 insertions and 29 deletions:

rhodecode/config/routing.py

rhodecode/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

rhodecode/config/routing.py

➞

Show inline comments

@@ @@ -490,14 +490,14 @@ def make_map(config): @@
     rmap.connect('compare_url',
                  '/{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|org_ref_type)',
                             other_ref_type='(branch|book|tag|rev|other_ref_type)')
                             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',
                  action='index', conditions=dict(function=check_repo,
                                                  method=["GET"]))

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -135,46 +135,41 @@ @@
   PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
   var other_repos_info = ${c.other_repos_info|n};
   var loadPreview = function(){
       YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none');
       //url template
       var url = "${h.url('compare_url',
                          repo_name='org_repo',
                          org_ref_type='org_ref_type', org_ref='org_ref',
                          other_repo='other_repo',
                          other_ref_type='other_ref_type', other_ref='other_ref',
                          repo_name='__org_repo__',
                          org_ref_type='__org_ref_type__',
                          org_ref='__org_ref__',
                          other_repo='__other_repo__',
                          other_ref_type='__other_ref_type__',
                          other_ref='__other_ref__',
                          as_form=True,
                          rev_start=request.GET.get('rev_start',''),
                          rev_end=request.GET.get('rev_end',''))}";
       var org_repo = YUQ('#pull_request_form #org_repo')[0].value;
       var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':');
       var other_repo = YUQ('#pull_request_form #other_repo')[0].value;
       var other_ref = YUQ('#pull_request_form #other_ref')[0].value.split(':');
       var select_refs = YUQ('#pull_request_form select.refs')
       var rev_data = {}; // gather the org/other ref and repo here
       for(var i=0;i<select_refs.length;i++){
         var select_ref = select_refs[i];
         var select_ref_data = select_ref.value.split(':');
         var key = null;
         var val = null;
       var rev_data = {
     	  'org_repo': org_repo,
     	  'org_ref': org_ref[1],
     	  'org_ref_type': org_ref[0],
     	  'other_repo': other_repo,
           'other_ref': other_ref[1],
           'other_ref_type': other_ref[0],
       }; // gather the org/other ref and repo here
         if(select_ref_data.length>1){
           key = select_ref.name+"_type";
           val = select_ref_data[0];
           url = url.replace(key,val);
           rev_data[key] = val;
           key = select_ref.name;
           val = select_ref_data[1];
           url = url.replace(key,val);
           rev_data[key] = val;
         }else{
           key = select_ref.name;
           val = select_ref.value;
           url = url.replace(key,val);
           rev_data[key] = val;
+        }
       for (k in rev_data){
     	  url = url.replace('__'+k+'__',rev_data[k]);
+      }
       YUE.on('other_repo', 'change', function(e){
           var repo_name = e.currentTarget.value;
           // replace the <select> of changed repo
           YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];

0 comments (0 inline, 0 general)