Changeset - 0ff919f1c283
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 0
Marcin Kuzminski - 13 years ago 2012-07-05 16:48:56
marcin@python-works.com
Fixed sorting by data when using custom date format from settings
3 files changed with 14 insertions and 5 deletions:
rhodecode/public/js/rhodecode.js
12
3
rhodecode/templates/admin/repos/repos.html
1
1
rhodecode/templates/index_base.html
1
1
0 comments (0 inline, 0 general)
rhodecode/public/js/rhodecode.js
➞
Show inline comments
 
@@ -1206,116 +1206,125 @@ var quick_repo_menu = function(){
 
    YUE.on(YUQ('.quick_repo_menu'),'mouseenter',function(e){
 
            var menu = e.currentTarget.firstElementChild.firstElementChild;
 
            if(YUD.hasClass(menu,'hidden')){
 
                YUD.replaceClass(e.currentTarget,'hidden', 'active');
 
                YUD.replaceClass(menu, 'hidden', 'active');
 
            }
 
        })
 
    YUE.on(YUQ('.quick_repo_menu'),'mouseleave',function(e){
 
            var menu = e.currentTarget.firstElementChild.firstElementChild;
 
            if(YUD.hasClass(menu,'active')){
 
                YUD.replaceClass(e.currentTarget, 'active', 'hidden');
 
                YUD.replaceClass(menu, 'active', 'hidden');
 
            }
 
        })
 
};
 

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * TABLE SORTING

			




	
	
	
		
 
 */

			




	
	
	
		
 

			




	
	
	
		
 
// returns a node from given html;

			




	
	
	
		
 
var fromHTML = function(html){

			




	
	
	
		
 
	  var _html = document.createElement('element');

			




	
	
	
		
 
	  _html.innerHTML = html;

			




	
	
	
		
 
	  return _html;

			




	
	
	
		
 
}

			




	
	
	
		
 
var get_rev = function(node){

			




	
	
	
		
 
    var n = node.firstElementChild.firstElementChild;

			




	
	
	
		
 
    

			




	
	
	
		
 
    if (n===null){

			




	
	
	
		
 
        return -1

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else{

			




	
	
	
		
 
        out = n.firstElementChild.innerHTML.split(':')[0].replace('r','');

			




	
	
	
		
 
        return parseInt(out);

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
var get_name = function(node){

			




	
	
	
		
 
	 var name = node.firstElementChild.children[2].innerHTML; 

			




	
	
	
		
 
	 return name

			




	
	
	
		
 
}

			




	
	
	
		
 
var get_group_name = function(node){

			




	
	
	
		
 
	var name = node.firstElementChild.children[1].innerHTML;

			




	
	
	
		
 
	return name

			




	
	
	
		
 
}

			




	
	
	
		
 
var get_date = function(node){

			




	
	
	
		
 
	var date_ = node.firstElementChild.innerHTML;

			




	
	
	
		
 
	var date_ = YUD.getAttribute(node.firstElementChild,'date');

			




	
	
	
		
 
	return date_

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
var get_age = function(node){

			




	
	
	
		
 
	console.log(node);

			




	
	
	
		
 
	return node

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
var revisionSort = function(a, b, desc, field) {

			




	
	
	
		
 
	  

			




	
	
	
		
 
	  var a_ = fromHTML(a.getData(field));

			




	
	
	
		
 
	  var b_ = fromHTML(b.getData(field));

			




	
	
	
		
 
	  

			




	
	
	
		
 
	  // extract revisions from string nodes 

			




	
	
	
		
 
	  a_ = get_rev(a_)

			




	
	
	
		
 
	  b_ = get_rev(b_)

			




	
	
	
		
 
	      	  

			




	
	
	
		
 
	  var comp = YAHOO.util.Sort.compare;

			




	
	
	
		
 
	  var compState = comp(a_, b_, desc);

			




	
	
	
		
 
	  return compState;

			




	
	
	
		
 
};

			




	
	
	
		
 
var ageSort = function(a, b, desc, field) {

			




	
	
	
		
 
    var a_ = a.getData(field);

			




	
	
	
		
 
    var b_ = b.getData(field);

			




	
	
	
		
 
    var a_ = fromHTML(a.getData(field));

			




	
	
	
		
 
    var b_ = fromHTML(b.getData(field));

			




	
	
	
		
 
    

			




	
	
	
		
 
    // extract name from table

			




	
	
	
		
 
    a_ = get_date(a_)

			




	
	
	
		
 
    b_ = get_date(b_)          

			




	
	
	
		
 
    

			




	
	
	
		
 
    var comp = YAHOO.util.Sort.compare;

			




	
	
	
		
 
    var compState = comp(a_, b_, desc);

			




	
	
	
		
 
    return compState;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
var nameSort = function(a, b, desc, field) {

			




	
	
	
		
 
    var a_ = fromHTML(a.getData(field));

			




	
	
	
		
 
    var b_ = fromHTML(b.getData(field));

			




	
	
	
		
 
    

			




	
	
	
		
 
    // extract name from table

			




	
	
	
		
 
    a_ = get_name(a_)

			




	
	
	
		
 
    b_ = get_name(b_)          

			




	
	
	
		
 
    

			




	
	
	
		
 
    var comp = YAHOO.util.Sort.compare;

			




	
	
	
		
 
    var compState = comp(a_, b_, desc);

			




	
	
	
		
 
    return compState;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
var permNameSort = function(a, b, desc, field) {

			




	
	
	
		
 
    var a_ = fromHTML(a.getData(field));

			




	
	
	
		
 
    var b_ = fromHTML(b.getData(field));

			




	
	
	
		
 
    // extract name from table

			




	
	
	
		
 

			




	
	
	
		
 
    a_ = a_.children[0].innerHTML;

			




	
	
	
		
 
    b_ = b_.children[0].innerHTML;      

			




	
	
	
		
 
    

			




	
	
	
		
 
    var comp = YAHOO.util.Sort.compare;

			




	
	
	
		
 
    var compState = comp(a_, b_, desc);

			




	
	
	
		
 
    return compState;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
var groupNameSort = function(a, b, desc, field) {

			




	
	
	
		
 
    var a_ = fromHTML(a.getData(field));

			




	
	
	
		
 
    var b_ = fromHTML(b.getData(field));

			




	
	
	
		
 
    

			




	
	
	
		
 
    // extract name from table

			




	
	
	
		
 
    a_ = get_group_name(a_)

			




	
	
	
		
 
    b_ = get_group_name(b_)          

			




	
	
	
		
 
    

			




	
	
	
		
 
    var comp = YAHOO.util.Sort.compare;

			




	
	
	
		
 
    var compState = comp(a_, b_, desc);

			




	
	
	
		
 
    return compState;

			




	
	
	
		
 
};

			




	
	
	
		
 
var dateSort = function(a, b, desc, field) {

			




	
	
	
		
 
    var a_ = fromHTML(a.getData(field));

			




	
	
	
		
 
    var b_ = fromHTML(b.getData(field));

			




	
	
	
		
 
    

			




        

    


    
    

    

        

                

                    rhodecode/templates/admin/repos/repos.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -11,97 +11,97 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
	${self.menu('admin')}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
        <ul class="links">

			




	
	
	
		
 
          <li>

			




	
	
	
		
 
            <span>${h.link_to(_(u'ADD REPOSITORY'),h.url('new_repo'))}</span>

			




	
	
	
		
 
          </li>

			




	
	
	
		
 
        </ul>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
        <div id='repos_list_wrap' class="yui-skin-sam">

			




	
	
	
		
 
        <%cnt=0%>

			




	
	
	
		
 
        <%namespace name="dt" file="/data_table/_dt_elements.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
        <table id="repos_list">

			




	
	
	
		
 
         <thead>

			




	
	
	
		
 
          <tr>

			




	
	
	
		
 
            <th class="left"></th>

			




	
	
	
		
 
  	        <th class="left">${_('Name')}</th>

			




	
	
	
		
 
  	        <th class="left">${_('Description')}</th>

			




	
	
	
		
 
  	        <th class="left">${_('Last change')}</th>

			




	
	
	
		
 
  	        <th class="left">${_('Tip')}</th>

			




	
	
	
		
 
  	        <th class="left">${_('Contact')}</th>

			




	
	
	
		
 
            <th class="left">${_('Action')}</th>

			




	
	
	
		
 
          </tr>

			




	
	
	
		
 
         </thead>

			




	
	
	
		
 

			




	
	
	
		
 
          %for cnt,repo in enumerate(c.repos_list):

			




	
	
	
		
 
          <tr class="parity${(cnt+1)%2}">

			




	
	
	
		
 
              <td class="quick_repo_menu">

			




	
	
	
		
 
                ${dt.quick_menu(repo['name'])}

			




	
	
	
		
 
              </td>

			




	
	
	
		
 
              <td class="reponame">

			




	
	
	
		
 
                ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],repo['dbrepo_fork'].get('repo_name'), admin=True)}

			




	
	
	
		
 
              </td>

			




	
	
	
		
 
              ##DESCRIPTION

			




	
	
	
		
 
              <td><span class="tooltip" title="${h.tooltip(repo['description'])}">

			




	
	
	
		
 
                 ${h.truncate(repo['description'],60)}</span>

			




	
	
	
		
 
              </td>

			




	
	
	
		
 
              ##LAST CHANGE

			




	
	
	
		
 
              <td>

			




	
	
	
		
 
                <span class="tooltip" title="${h.tooltip(repo['last_change'])}">${h.age(repo['last_change'])}</span>

			




	
	
	
		
 
                <span class="tooltip" date="${repo['last_change']}" title="${h.tooltip(repo['last_change'])}">${h.age(repo['last_change'])}</span>

			




	
	
	
		
 
              </td>

			




	
	
	
		
 
              ##LAST REVISION

			




	
	
	
		
 
              <td>

			




	
	
	
		
 
                  ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}

			




	
	
	
		
 
              </td>

			




	
	
	
		
 
            <td title="${repo['contact']}">${h.person(repo['contact'])}</td>

			




	
	
	
		
 
              <td>

			




	
	
	
		
 
                ${h.form(url('repo', repo_name=repo['name']),method='delete')}

			




	
	
	
		
 
                  ${h.submit('remove_%s' % repo['name'],_('delete'),class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo['name']+"');")}

			




	
	
	
		
 
                ${h.end_form()}

			




	
	
	
		
 
              </td>

			




	
	
	
		
 
          </tr>

			




	
	
	
		
 
          %endfor

			




	
	
	
		
 
        </table>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<script>

			




	
	
	
		
 

			




	
	
	
		
 
  // main table sorting

			




	
	
	
		
 
  var myColumnDefs = [

			




	
	
	
		
 
      {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"},

			




	
	
	
		
 
      {key:"name",label:"${_('Name')}",sortable:true,

			




	
	
	
		
 
          sortOptions: { sortFunction: nameSort }},

			




	
	
	
		
 
      {key:"desc",label:"${_('Description')}",sortable:true},

			




	
	
	
		
 
      {key:"last_change",label:"${_('Last Change')}",sortable:true,

			




	
	
	
		
 
          sortOptions: { sortFunction: ageSort }},

			




	
	
	
		
 
      {key:"tip",label:"${_('Tip')}",sortable:true,

			




	
	
	
		
 
          sortOptions: { sortFunction: revisionSort }},

			




	
	
	
		
 
      {key:"owner",label:"${_('Owner')}",sortable:true},

			




	
	
	
		
 
      {key:"action",label:"${_('Action')}",sortable:false},

			




	
	
	
		
 
  ];

			




	
	
	
		
 

			




	
	
	
		
 
  var myDataSource = new YAHOO.util.DataSource(YUD.get("repos_list"));

			




	
	
	
		
 

			




	
	
	
		
 
  myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;

			




	
	
	
		
 

			




	
	
	
		
 
  myDataSource.responseSchema = {

			




	
	
	
		
 
      fields: [

			




	
	
	
		
 
          {key:"menu"},

			




	
	
	
		
 
          {key:"name"},

			




	
	
	
		
 
          {key:"desc"},

			




	
	
	
		
 
          {key:"last_change"},

			




	
	
	
		
 
          {key:"tip"},

			




	
	
	
		
 
          {key:"owner"},

			




	
	
	
		
 
          {key:"action"},

			




	
	
	
		
 
      ]

			




	
	
	
		
 
  };

			




        

    


    
    

    

        

                

                    rhodecode/templates/index_base.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -44,97 +44,97 @@

			




	
	
	
		
 
                        <td>${gr.group_description}</td>

			




	
	
	
		
 
                        ## this is commented out since for multi nested repos can be HEAVY!

			




	
	
	
		
 
                        ## in number of executed queries during traversing uncomment at will

			




	
	
	
		
 
                        ##<td><b>${gr.repositories_recursive_count}</b></td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                  % endfor

			




	
	
	
		
 

			




	
	
	
		
 
              </table>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="height: 20px"></div>

			




	
	
	
		
 
            % endif

			




	
	
	
		
 
            <div id="welcome" style="display:none;text-align:center">

			




	
	
	
		
 
                <h1><a href="${h.url('home')}">${c.rhodecode_name} ${c.rhodecode_version}</a></h1>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id='repos_list_wrap' class="yui-skin-sam">

			




	
	
	
		
 
            <%cnt=0%>

			




	
	
	
		
 
            <%namespace name="dt" file="/data_table/_dt_elements.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
            <table id="repos_list">

			




	
	
	
		
 
            <thead>

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                    <th class="left"></th>

			




	
	
	
		
 
                    <th class="left">${_('Name')}</th>

			




	
	
	
		
 
                    <th class="left">${_('Description')}</th>

			




	
	
	
		
 
                    <th class="left">${_('Last change')}</th>

			




	
	
	
		
 
                    <th class="left">${_('Tip')}</th>

			




	
	
	
		
 
                    <th class="left">${_('Owner')}</th>

			




	
	
	
		
 
                    <th class="left">${_('RSS')}</th>

			




	
	
	
		
 
                    <th class="left">${_('Atom')}</th>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            </thead>

			




	
	
	
		
 
            <tbody>

			




	
	
	
		
 
            %for cnt,repo in enumerate(c.repos_list):

			




	
	
	
		
 
                <tr class="parity${(cnt+1)%2}">

			




	
	
	
		
 
                    ##QUICK MENU

			




	
	
	
		
 
                    <td class="quick_repo_menu">

			




	
	
	
		
 
                      ${dt.quick_menu(repo['name'])}

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    ##REPO NAME AND ICONS

			




	
	
	
		
 
                    <td class="reponame">

			




	
	
	
		
 
                      ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],repo['dbrepo_fork'].get('repo_name'),pageargs.get('short_repo_names'))}

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    ##DESCRIPTION

			




	
	
	
		
 
                    <td><span class="tooltip" title="${h.tooltip(repo['description'])}">

			




	
	
	
		
 
                       ${h.truncate(repo['description'],60)}</span>

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    ##LAST CHANGE DATE

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                      <span class="tooltip" title="${h.tooltip(h.fmt_date(repo['last_change']))}">${h.age(repo['last_change'])}</span>

			




	
	
	
		
 
                      <span class="tooltip" date="${repo['last_change']}" title="${h.tooltip(h.fmt_date(repo['last_change']))}">${h.age(repo['last_change'])}</span>

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    ##LAST REVISION

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                        ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    ##

			




	
	
	
		
 
                    <td title="${repo['contact']}">${h.person(repo['contact'])}</td>

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                      %if c.rhodecode_user.username != 'default':

			




	
	
	
		
 
                        <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon"  href="${h.url('rss_feed_home',repo_name=repo['name'],api_key=c.rhodecode_user.api_key)}"></a>

			




	
	
	
		
 
                      %else:

			




	
	
	
		
 
                        <a title="${_('Subscribe to %s rss feed')%repo['name']}" class="rss_icon"  href="${h.url('rss_feed_home',repo_name=repo['name'])}"></a>

			




	
	
	
		
 
                      %endif:

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                    <td>

			




	
	
	
		
 
                      %if c.rhodecode_user.username != 'default':

			




	
	
	
		
 
                        <a title="${_('Subscribe to %s atom feed')%repo['name']}"  class="atom_icon" href="${h.url('atom_feed_home',repo_name=repo['name'],api_key=c.rhodecode_user.api_key)}"></a>

			




	
	
	
		
 
                      %else:

			




	
	
	
		
 
                        <a title="${_('Subscribe to %s atom feed')%repo['name']}"  class="atom_icon" href="${h.url('atom_feed_home',repo_name=repo['name'])}"></a>

			




	
	
	
		
 
                      %endif:

			




	
	
	
		
 
                    </td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </tbody>

			




	
	
	
		
 
            </table>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <script>

			




	
	
	
		
 
      YUD.get('repo_count').innerHTML = ${cnt+1 if cnt else 0};

			




	
	
	
		
 
      var func = function(node){

			




	
	
	
		
 
          return node.parentNode.parentNode.parentNode.parentNode;

			




	
	
	
		
 
      }

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
      // groups table sorting

			




	
	
	
		
 
      var myColumnDefs = [

			




	
	
	
		
 
          {key:"name",label:"${_('Group Name')}",sortable:true,

			




	
	
	
		
 
              sortOptions: { sortFunction: groupNameSort }},

			




	
	
	
		
 
          {key:"desc",label:"${_('Description')}",sortable:true},

			




	
	
	
		
 
      ];

			




	
	
	
		
 

			




	
	
	
		
 
      var myDataSource = new YAHOO.util.DataSource(YUD.get("groups_list"));

			




	
	
	
		
 

			




	
	
	
		
 
      myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;

			




	
	
	
		
 
      myDataSource.responseSchema = {

			




	
	
	
		
 
          fields: [

			




	
	
	
		
 
              {key:"name"},

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.