Changeset - 9937afa7f093
rhodecode/controllers/admin/repos_groups.py
Show inline comments
 
@@ -342,8 +342,8 @@ class ReposGroupsController(BaseControll
 
                "sort": "name",
 
                "dir": "asc",
 
                "records": repos_data
 
            })        
 
        
 
            })
 

	
 
        return render('admin/repos_groups/repos_groups.html')
 

	
 
    @HasPermissionAnyDecorator('hg.admin')
rhodecode/controllers/files.py
Show inline comments
 
@@ -157,7 +157,7 @@ class FilesController(BaseRepoController
 
                _hist = c.rhodecode_repo.get_changeset().get_file_history(f_path)
 
                c.file_changeset = c.changeset
 
                if _hist:
 
                    c.file_changeset = (c.changeset 
 
                    c.file_changeset = (c.changeset
 
                                        if c.changeset.revision < _hist[0].revision
 
                                        else _hist[0])
 
                c.file_history = self._get_node_history(None, f_path, _hist)
rhodecode/lib/middleware/errormator.py
Show inline comments
 
@@ -28,4 +28,4 @@ try:
 
except ImportError:
 
    Errormator = None
 
else:
 
    Errormator = make_errormator_middleware
 
\ No newline at end of file
 
    Errormator = make_errormator_middleware
rhodecode/lib/middleware/sentry.py
Show inline comments
 
@@ -44,4 +44,4 @@ else:
 
                include_paths=list_from_setting(config, 'sentry.include_paths'),
 
                exclude_paths=list_from_setting(config, 'sentry.exclude_paths'),
 
            )
 
            super(Sentry, self).__init__(app, client)
 
\ No newline at end of file
 
            super(Sentry, self).__init__(app, client)
rhodecode/templates/changelog/changelog.html
Show inline comments
 
@@ -35,7 +35,7 @@ ${_('%s Changelog') % c.repo_name} - ${c
 
                    <div class="info_box" style="clear: both;padding: 10px 6px;vertical-align: right;text-align: right;">
 
                    <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a>
 
                    <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
 
                    
 

	
 
                    %if c.rhodecode_db_repo.fork:
 
                        <a title="${_('compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref=request.GET.get('branch') or 'default',other_ref_type='branch',other_ref='default',repo=c.rhodecode_db_repo.fork.repo_name)}" class="ui-btn small">${_('Compare fork')}</a>
 
                    %endif
 
@@ -161,11 +161,11 @@ ${_('%s Changelog') % c.repo_name} - ${c
 
                        if(checked_checkboxes.length>0){
 
                          // modify open pull request to show we have selected cs
 
                          YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets'];
 
                                                  	
 

	
 
                        }else{
 
                          YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];                        	
 
                          YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];
 
                        }
 
                        
 

	
 
                        if(checked_checkboxes.length>1){
 
                        	var rev_end = checked_checkboxes[0].name;
 
                        	var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
 
@@ -188,9 +188,9 @@ ${_('%s Changelog') % c.repo_name} - ${c
 
                        		if (rev == rev_start){
 
                                    checked = false;
 
                                }
 
 
 

	
 
                        	}
 
                        	
 

	
 
                            var url = url_tmpl.replace('__REVRANGE__',
 
                            		rev_start+'...'+rev_end);
 

	
 
@@ -201,7 +201,7 @@ ${_('%s Changelog') % c.repo_name} - ${c
 
                            YUD.get('rev_range_container').innerHTML = link;
 
                            YUD.setStyle('rev_range_container','display','');
 
                            YUD.setStyle('rev_range_clear','display','');
 
                        
 

	
 
                        }
 
                        else{
 
                        	YUD.setStyle('rev_range_container','display','none');
rhodecode/templates/changeset/changeset_range.html
Show inline comments
 
@@ -94,8 +94,8 @@
 
                    <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 
                    ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
 
                %endfor
 
              </span>        
 
            </div>   
 
              </span>
 
            </div>
 
           </div>
 
          ${diff_block.diff_block(c.changes[cs.raw_id])}
 
          ##${comment.comments(cs)}
rhodecode/templates/followers/followers_data.html
Show inline comments
 
@@ -22,7 +22,7 @@ YUE.onDOMReady(function(){
 
        ypjax(e.target.href,"followers",function(){
 
        	show_more_event();
 
        	tooltip_activate();
 
        	show_changeset_tooltip();	
 
        	show_changeset_tooltip();
 
        });
 
        YUE.preventDefault(e);
 
    },'.pager_link');
rhodecode/templates/forks/forks_data.html
Show inline comments
 
@@ -30,7 +30,7 @@
 
          ypjax(e.target.href,"forks",function(){
 
        	  show_more_event();
 
        	  tooltip_activate();
 
        	  show_changeset_tooltip(); 
 
        	  show_changeset_tooltip();
 
          });
 
          YUE.preventDefault(e);
 
      },'.pager_link');
rhodecode/templates/index_base.html
Show inline comments
 
@@ -163,7 +163,7 @@
 
              firstPageLinkLabel: '&lt;&lt;',
 
              lastPageLinkLabel: '&gt;&gt;',
 
              containers:['user-paginator']
 
          }),          
 
          }),
 
          MSG_SORTASC:"${_('Click to sort ascending')}",
 
          MSG_SORTDESC:"${_('Click to sort descending')}"
 
      });
 
@@ -224,7 +224,7 @@
 
        var data = ${c.data|n};
 
        var myDataSource = new YAHOO.util.DataSource(data);
 
        myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
 
      
 

	
 
        myDataSource.responseSchema = {
 
            resultsList: "records",
 
            fields: [
 
@@ -243,7 +243,7 @@
 
            var data     = res.results || [],
 
                filtered = [],
 
                i,l;
 
      
 

	
 
            if (req) {
 
                req = req.toLowerCase();
 
                for (i = 0; i<data.length; i++) {
 
@@ -257,7 +257,7 @@
 
            YUD.get('repo_count').innerHTML = res.results.length;
 
            return res;
 
        }
 
      
 

	
 
        // main table sorting
 
        var myColumnDefs = [
 
            {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},
 
@@ -270,7 +270,7 @@
 
            {key:"rss",label:"",sortable:false},
 
            {key:"atom",label:"",sortable:false},
 
        ];
 
      
 

	
 
        var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{
 
          sortedBy:{key:"name",dir:"asc"},
 
          paginator: new YAHOO.widget.Paginator({
 
@@ -287,7 +287,7 @@
 
              lastPageLinkLabel: '&gt;&gt;',
 
              containers:['user-paginator']
 
          }),
 
      
 

	
 
          MSG_SORTASC:"${_('Click to sort ascending')}",
 
          MSG_SORTDESC:"${_('Click to sort descending')}",
 
          MSG_EMPTY:"${_('No records found.')}",
 
@@ -299,17 +299,17 @@
 
            tooltip_activate();
 
            quick_repo_menu();
 
        });
 
      
 

	
 
        var filterTimeout = null;
 
      
 

	
 
        updateFilter  = function () {
 
            // Reset timeout
 
            filterTimeout = null;
 
      
 

	
 
            // Reset sort
 
            var state = myDataTable.getState();
 
                state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC};
 
      
 

	
 
            // Get filtered data
 
            myDataSource.sendRequest(YUD.get('q_filter').value,{
 
                success : myDataTable.onDataReturnInitializeTable,
 
@@ -317,16 +317,15 @@
 
                scope   : myDataTable,
 
                argument: state
 
            });
 
      
 

	
 
        };
 
        YUE.on('q_filter','click',function(){
 
            YUD.get('q_filter').value = '';
 
         });
 
      
 

	
 
        YUE.on('q_filter','keyup',function (e) {
 
            clearTimeout(filterTimeout);
 
            filterTimeout = setTimeout(updateFilter,600);
 
        });
 
      </script>
 
    % endif
 
    
 
\ No newline at end of file
rhodecode/templates/journal/journal.html
Show inline comments
 
@@ -38,7 +38,7 @@
 
        <div class="title">
 
            <h5>
 
            <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
 
            <a id="show_watched" class="link-white" href="#watched">${_('Watched')}</a> / <a id="show_my" class="link-white" href="#my">${_('My repos')}</a> 
 
            <a id="show_watched" class="link-white" href="#watched">${_('Watched')}</a> / <a id="show_my" class="link-white" href="#my">${_('My repos')}</a>
 
            </h5>
 
             %if h.HasPermissionAny('hg.admin','hg.create.repository')():
 
             <ul class="links">
 
@@ -117,10 +117,10 @@
 
            var nodes = YUQ('#my tr td a.repo_name');
 
            var func = function(node){
 
                return node.parentNode.parentNode.parentNode;
 
            }            
 
            }
 
            q_filter('q_filter',nodes,func);
 
        });        
 
        
 
        });
 

	
 
    }
 
    YUE.on('show_my','click',function(e){
 
        show_my(e);
 
@@ -140,7 +140,7 @@
 
    })
 
    //init watched
 
    show_watched();
 
    
 

	
 
    var tabs = {
 
        'watched': show_watched,
 
        'my': show_my,
 
@@ -150,8 +150,8 @@
 
        //We have a hash
 
        var tabHash = url[1];
 
        tabs[tabHash]();
 
    }    
 
    
 
    }
 

	
 
    YUE.on('refresh','click',function(e){
 
        ypjax(e.currentTarget.href,"journal",function(){
 
        	show_more_event();
rhodecode/templates/journal/journal_page_repos.html
Show inline comments
 
@@ -44,4 +44,4 @@
 
        ${h.link_to(_('create one now'),h.url('admin_settings_create_repository'),class_="ui-btn")}
 
    %endif
 
    </div>
 
 %endif
 
\ No newline at end of file
 
 %endif
rhodecode/templates/pullrequests/pullrequest_show.html
Show inline comments
 
@@ -73,7 +73,7 @@
 
              <div id="affected_files">
 
              % if c.files:
 
                <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
 
                <div class="cs_files">              
 
                <div class="cs_files">
 
                %for fid, change, f, stat in c.files:
 
                    <div class="cs_${change}">
 
                      <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div>
rhodecode/templates/summary/summary.html
Show inline comments
 
@@ -63,15 +63,15 @@
 
                      </span>
 
                      %endif
 
                  %endif:
 
                 
 

	
 
                   ## locking icon
 
                    %if c.rhodecode_db_repo.enable_locking:
 
                      %if c.rhodecode_db_repo.locked[0]:
 
                        <span class="locking_locked tooltip" title="${_('Repository locked by %s') % h.person_by_id(c.rhodecode_db_repo.locked[0])}"></span>                     
 
                        <span class="locking_locked tooltip" title="${_('Repository locked by %s') % h.person_by_id(c.rhodecode_db_repo.locked[0])}"></span>
 
                      %else:
 
                        <span class="locking_unlocked tooltip" title="${_('Repository unlocked')}"></span>
 
                      %endif
 
                    %endif                   
 
                    %endif
 
                 ##REPO TYPE
 
		         %if h.is_hg(c.dbrepo):
 
		           <img style="margin-bottom:2px" class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/>
rhodecode/tests/functional/test_home.py
Show inline comments
 
@@ -76,4 +76,3 @@ merge" class="tooltip" href="/vcs_test_h
 
            response.mustcontain("""var data = {"totalRecords": %s""" % len(Repository.getAll()))
 
        finally:
 
            set_l_dash(False)
 

	
0 comments (0 inline, 0 general)