ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-843 Fixed admin filter.
Date Wed, 17 Feb 2016 07:03:10 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 68d171c9f -> aa5bf5c7b


IGNITE-843 Fixed admin filter.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa5bf5c7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa5bf5c7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa5bf5c7

Branch: refs/heads/ignite-843-rc2
Commit: aa5bf5c7b721eba489423a64aaa0676031b23639
Parents: 68d171c
Author: Dmitriyff <dmitriyff@gmail.com>
Authored: Wed Feb 17 14:03:35 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Feb 17 14:03:35 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/admin-controller.js                 | 5 +++++
 .../control-center-web/src/main/js/views/settings/admin.jade    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/aa5bf5c7/modules/control-center-web/src/main/js/controllers/admin-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/admin-controller.js b/modules/control-center-web/src/main/js/controllers/admin-controller.js
index 2d10f76..107d310 100644
--- a/modules/control-center-web/src/main/js/controllers/admin-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/admin-controller.js
@@ -25,6 +25,11 @@ consoleModule.controller('adminController',
         $http.post('/api/v1/admin/list')
             .success(function (data) {
                 $scope.users = data;
+
+                _.forEach($scope.users, function(user) {
+                    user.label = user.username + ' ' + user.email + ' ' +
+                        (user.company || '') + ' ' + (user.country || '') + ' ' + user.lastLogin;
+                })
             })
             .error(function (errMsg) {
                 $common.showError($common.errorMessage(errMsg));

http://git-wip-us.apache.org/repos/asf/ignite/blob/aa5bf5c7/modules/control-center-web/src/main/js/views/settings/admin.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/settings/admin.jade b/modules/control-center-web/src/main/js/views/settings/admin.jade
index 9475aae..69a2971 100644
--- a/modules/control-center-web/src/main/js/views/settings/admin.jade
+++ b/modules/control-center-web/src/main/js/views/settings/admin.jade
@@ -26,7 +26,7 @@
                         tr
                             th.header(colspan='7')
                                 .col-xs-2.pull-right
-                                    input.form-control(type='text' st-search='' placeholder='Filter
users...')
+                                    input.form-control(type='text' st-search='label' placeholder='Filter
users...')
                         tr
                             th(st-sort='username') User name
                             th(st-sort='email') Email


Mime
View raw message