kallithea Changeset - 2b672f04bfd9

Changeset - 2b672f04bfd9

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2012-09-19 00:38:21
marcin@python-works.com

fixed few issues with autoselection of revisions on pull requests

3 files changed with 39 insertions and 6 deletions:

rhodecode/controllers/pullrequests.py

rhodecode/public/js/rhodecode.js

rhodecode/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -81,6 +81,19 @@ class PullrequestsController(BaseRepoCon @@
         return hist_l
     def _get_default_rev(self, repo):
         """
         Get's default revision to do compare on pull request
         :param repo:
         """
         repo = repo.scm_instance
         if 'default' in repo.branches:
             return 'default'
         else:
             #if repo doesn't have default branch return first found
             return repo.branches.keys()[0]
     def show_all(self, repo_name):
         c.pull_requests = PullRequestModel().get_all(repo_name)
         c.repo_name = repo_name
@@ @@ -106,7 +119,8 @@ class PullrequestsController(BaseRepoCon @@
         # add org repo to other so we can open pull request agains itself
         c.other_repos.extend(c.org_repos)
         c.default_pull_request = org_repo.repo_name
         c.default_pull_request = org_repo.repo_name  # repo name pre-selected
         c.default_pull_request_rev = self._get_default_rev(org_repo)  # revision pre-selected
         c.default_revs = self._get_repo_refs(org_repo.scm_instance)
         #add orginal repo
         other_repos_info[org_repo.repo_name] = {
@@ @@ -130,6 +144,8 @@ class PullrequestsController(BaseRepoCon @@
         #add parents of this fork also
         if org_repo.parent:
             c.default_pull_request = org_repo.parent.repo_name
             c.default_pull_request_rev = self._get_default_rev(org_repo.parent)
             c.default_revs = self._get_repo_refs(org_repo.parent.scm_instance)
             c.other_repos.append((org_repo.parent.repo_name, '%s/%s' % (
                                         org_repo.parent.user.username,
                                         org_repo.parent.repo_name))

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -86,7 +86,18 @@ var prevElementSibling = function( el ) @@
+    }
+}
 var setSelectValue = function(select, val){
 	var selection =  YUD.get(select);
     // select element
     for(var i=0;i<selection.options.length;i++){
     	console.log(selection.options[i].innerHTML);
         if (selection.options[i].innerHTML == val) {
             selection.selectedIndex = i;
             break;
+        }
+    }
+}
 /**

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -53,7 +53,7 @@ @@
                     <img id="other_repo_gravatar" alt="gravatar" src=""/>
                 </div>
                 <span style="font-size: 20px">
-                ${h.select('other_repo',c.default_pull_request ,c.other_repos,class_='refs')}:${h.select('other_ref','',c.default_revs,class_='refs')}
+                ${h.select('other_repo',c.default_pull_request ,c.other_repos,class_='refs')}:${h.select('other_ref',c.default_pull_request_rev,c.default_revs,class_='refs')}
                 </span>
                  <div id="other_repo_desc" style="padding:5px 3px 3px 42px;"></div>
             </div>
@@ @@ -146,25 +146,29 @@ @@
                          as_form=True)}";
       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;
         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;
+        }
+      }
@@ @@ -182,6 +186,8 @@ @@
     	  YUD.get('other_repo_gravatar').src = other_repos_info[repo_name]['gravatar'];
     	  YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description'];
     	  YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];
     	  // select back the revision that was just compared
     	  setSelectValue(YUD.get('other_ref'), rev_data['other_ref']);
       })
+  }
   YUE.on('refresh','click',function(e){

0 comments (0 inline, 0 general)