Repository: archiva Updated Branches: refs/heads/master d533b8591 -> 8e8148886
[MRM-1809] Users - Manage section sort by name doesn't work as expected Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/8e814888 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/8e814888 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/8e814888 Branch: refs/heads/master Commit: 8e8148886bbcda08cfa7f607a2468d18ad201e2e Parents: d533b85 Author: Olivier Lamy <[email protected]> Authored: Tue May 6 16:12:14 2014 +1000 Committer: Olivier Lamy <[email protected]> Committed: Tue May 6 16:12:14 2014 +1000 ---------------------------------------------------------------------- .../resources/org/apache/archiva/i18n/default.properties | 2 +- .../archiva-webapp/src/main/webapp/js/redback/users.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/8e814888/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties index 556a2b2..684f6b3 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties @@ -240,7 +240,7 @@ menu.users-runtime-configuration=Users Runtime Configuration user.change.password.required=Change password required users.grid.tab.title=Users users.list=Users List -users.sort.byname=Sort by Name +users.sort.byname=Sort by User Name effective.roles.edit=Edit Roles locked=Locked validated=Validated http://git-wip-us.apache.org/repos/asf/archiva/blob/8e814888/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js index 0a3f19e..827a206 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js @@ -131,21 +131,21 @@ function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,typeahead) { lock = function(user){ clearUserMessages(); user.lock(); - } + }; unlock = function(user){ clearUserMessages(); user.unlock(); - } + }; passwordChangeRequire = function(user,forceChangedPassword){ clearUserMessages(); user.changePasswordChangeRequired(forceChangedPassword); - } + }; this.sortByName = function() { this.users.sort(function(a, b) { - return a.username < b.username ? -1 : 1; + return a.username().localeCompare(b.username()); }); };
