changeset 3638:dddf48cd1eb9 beta

fixed users sorting in admin pannel
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 30 Mar 2013 00:40:28 +0100
parents 58c2b54540d2
children 2f5816720f82
files rhodecode/public/js/rhodecode.js rhodecode/templates/admin/users/users.html
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/js/rhodecode.js	Fri Mar 29 23:58:07 2013 +0100
+++ b/rhodecode/public/js/rhodecode.js	Sat Mar 30 00:40:28 2013 +0100
@@ -1982,14 +1982,13 @@
     return compState;
 };
 
-var linkSort = function(a, b, desc, field) {
+var usernamelinkSort = function(a, b, desc, field) {
 	  var a_ = fromHTML(a.getData(field));
-	  var b_ = fromHTML(a.getData(field));
+	  var b_ = fromHTML(b.getData(field));
 	  
 	  // extract url text from string nodes 
 	  a_ = get_link(a_)
 	  b_ = get_link(b_)
-
 	  var comp = YAHOO.util.Sort.compare;
 	  var compState = comp(a_, b_, desc);
 	  return compState;
--- a/rhodecode/templates/admin/users/users.html	Fri Mar 29 23:58:07 2013 +0100
+++ b/rhodecode/templates/admin/users/users.html	Sat Mar 30 00:40:28 2013 +0100
@@ -75,7 +75,7 @@
   var myColumnDefs = [
       {key:"gravatar",label:"",sortable:false,},
       {key:"username",label:"${_('username')}",sortable:true,
-          sortOptions: { sortFunction: linkSort }
+          sortOptions: { sortFunction: usernamelinkSort }
       },
       {key:"firstname",label:"${_('firstname')}",sortable:true,},
       {key:"lastname",label:"${_('lastname')}",sortable:true,},