Changeset - 0b86972de820
[Not reviewed]
rhodecode/controllers/settings.py
Show inline comments
 
@@ -188,4 +188,3 @@ class SettingsController(BaseRepoControl
 
            h.flash(_('An error occurred during unlocking'),
 
                    category='error')
 
        return redirect(url('summary_home', repo_name=repo_name))
 

	
rhodecode/lib/db_manage.py
Show inline comments
 
@@ -667,4 +667,4 @@ class DbManage(object):
 
        if not __py_version__ >= (2, 6):
 
            notify('Python2.5 detected, please switch '
 
                   'egg:waitress#main -> egg:Paste#http '
 
                   'in your .ini file')
 
\ No newline at end of file
 
                   'in your .ini file')
rhodecode/templates/admin/users/user_edit_my_account.html
Show inline comments
 
@@ -118,7 +118,7 @@ var show_perms = function(e){
 
    YUD.setStyle('my','display','none');
 
    YUD.setStyle('pullrequests','display','none');
 
    YUD.setStyle('perms','display','');
 
    YUD.setStyle('q_filter','display','none');	
 
    YUD.setStyle('q_filter','display','none');
 
}
 
YUE.on('show_perms','click',function(e){
 
    show_perms();
 
@@ -134,12 +134,12 @@ var show_my = function(e){
 
    YUD.setStyle('my','display','');
 
    YUD.setStyle('q_filter','display','');
 

	
 
    
 

	
 
    var url = "${h.url('admin_settings_my_repos')}";
 
    ypjax(url, 'my', function(){
 
        table_sort();
 
        filter_activate();
 
    });	
 
    });
 
}
 
YUE.on('show_my','click',function(e){
 
	show_my(e);
 
@@ -154,9 +154,9 @@ var show_pullrequests = function(e){
 
    YUD.setStyle('perms','display','none');
 
    YUD.setStyle('pullrequests','display','');
 
    YUD.setStyle('q_filter','display','none');
 
    
 

	
 
    var url = "${h.url('admin_settings_my_pullrequests')}";
 
    ypjax(url, 'pullrequests');	
 
    ypjax(url, 'pullrequests');
 
}
 
YUE.on('show_pullrequests','click',function(e){
 
	show_pullrequests(e)
 
@@ -167,12 +167,12 @@ var tabs = {
 
    'my': show_my,
 
    'pullrequests': show_pullrequests
 
}
 
var url = location.href.split('#'); 
 
if (url[1]) { 
 
    //We have a hash 
 
var url = location.href.split('#');
 
if (url[1]) {
 
    //We have a hash
 
    var tabHash = url[1];
 
    console.log(tabs, tabHash)
 
    tabs[tabHash]();   
 
    tabs[tabHash]();
 
}
 

	
 
// main table sorting
rhodecode/templates/pullrequests/pullrequest.html
Show inline comments
 
@@ -133,7 +133,7 @@
 
  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');
 
      var url = "${h.url('compare_url',
 
@@ -150,18 +150,18 @@
 
        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;
 
@@ -175,7 +175,7 @@
 
    	  // replace the <select> of changed repo
 
    	  YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];
 
      });
 
      
 

	
 
      ypjax(url,'pull_request_overview', function(data){
 
    	  var sel_box = YUQ('#pull_request_form #other_repo')[0];
 
    	  var repo_name = sel_box.options[sel_box.selectedIndex].value;
rhodecode/templates/pullrequests/pullrequest_show.html
Show inline comments
 
@@ -47,7 +47,7 @@
 
            % if len(c.pull_request_pending_reviewers) > 0:
 
                <div class="tooltip" title="${h.tooltip(','.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>
 
            %else:
 
                <div>${_('pull request was reviewed by all reviewers')}</div>            
 
                <div>${_('pull request was reviewed by all reviewers')}</div>
 
            %endif
 
          </div>
 
         </div>
rhodecode/templates/shortlog/shortlog_data.html
Show inline comments
 
@@ -25,7 +25,7 @@
 
                %endif
 
                </div>
 
              %endif
 
            </div>            
 
            </div>
 
            <pre><a href="${h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id)}">r${cs.revision}:${h.short_id(cs.raw_id)}</a></pre>
 
         </div>
 
        </td>
rhodecode/tests/functional/test_compare.py
Show inline comments
 
@@ -400,4 +400,4 @@ class TestCompareController(TestControll
 
            self.assertFalse("""line1-from-new-parent"""  in response.body)
 
        finally:
 
            RepoModel().delete(r2_id)
 
            RepoModel().delete(r1_id)
 
\ No newline at end of file
 
            RepoModel().delete(r1_id)
rhodecode/tests/test_libs.py
Show inline comments
 
@@ -210,4 +210,3 @@ class TestLibs(unittest.TestCase):
 
                em = 'test@foo.com'
 
                grav = gravatar_url(email_address=em, size=24)
 
                assert grav == 'https://server.com/%s/%s' % (_md5(em), 24)
 

	
0 comments (0 inline, 0 general)