Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 30BA5185E1 for ; Thu, 9 Jul 2015 11:24:58 +0000 (UTC) Received: (qmail 79197 invoked by uid 500); 9 Jul 2015 11:24:58 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 79168 invoked by uid 500); 9 Jul 2015 11:24:58 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 79159 invoked by uid 99); 9 Jul 2015 11:24:58 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jul 2015 11:24:58 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id A48A6C0721 for ; Thu, 9 Jul 2015 11:24:57 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id l-jrJjXq_cr1 for ; Thu, 9 Jul 2015 11:24:46 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 1728C43DF1 for ; Thu, 9 Jul 2015 11:24:46 +0000 (UTC) Received: (qmail 79146 invoked by uid 99); 9 Jul 2015 11:24:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jul 2015 11:24:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47A2FE681A; Thu, 9 Jul 2015 11:24:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 09 Jul 2015 11:24:46 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-ignite git commit: # IGNITE-843 Fix notification. # IGNITE-843 Fix notification. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/87be5272 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/87be5272 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/87be5272 Branch: refs/heads/ignite-843 Commit: 87be527239c5fdae862e0f1238aa57361822a689 Parents: 62b1854 Author: sevdokimov Authored: Thu Jul 9 14:24:38 2015 +0300 Committer: sevdokimov Committed: Thu Jul 9 14:24:38 2015 +0300 ---------------------------------------------------------------------- .../nodejs/controllers/admin-controller.js | 40 ++++++++++++++------ .../nodejs/views/admin/userList.jade | 5 +-- 2 files changed, 31 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87be5272/modules/web-control-center/nodejs/controllers/admin-controller.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/controllers/admin-controller.js b/modules/web-control-center/nodejs/controllers/admin-controller.js index 8cff86b..870821d 100644 --- a/modules/web-control-center/nodejs/controllers/admin-controller.js +++ b/modules/web-control-center/nodejs/controllers/admin-controller.js @@ -15,16 +15,35 @@ * limitations under the License. */ -controlCenterModule.controller('adminController', ['$scope', '$alert', '$http', function ($scope, $alert, $http) { +controlCenterModule.controller('adminController', ['$scope', '$alert', '$http', 'commonFunctions', function ($scope, $alert, $http, commonFunctions) { $scope.userList = null; + $scope.showInfo = function (msg) { + $scope.showAlert(msg, 'success'); + }; + + $scope.showError = function (msg) { + $scope.showAlert(msg, 'danger'); + }; + + $scope.showAlert = function (msg, type) { + if ($scope.alert) + $scope.alert.hide(); + + $scope.alert = $alert({ + type: type, + title: msg, + duration: 2 + }); + }; + function reload() { $http.post('admin/list') .success(function (data) { $scope.userList = data; }) .error(function (errMsg) { - $alert({title: $scope.errorMessage(errMsg)}); + $scope.showError(commonFunctions.errorMessage(errMsg)); }); } @@ -36,21 +55,20 @@ controlCenterModule.controller('adminController', ['$scope', '$alert', '$http', $http.post('admin/remove', {userId: user._id}).success( function (data) { - $scope.alertStr = "User has been removed: " + user.username; - $scope.alertType = 'success'; - reload(); + + $scope.showInfo("User has been removed: " + user.username); }).error(function (err) { - $scope.alertStr = "Failed to remove user: " + err; + $scope.showError("Failed to remove user: " + commonFunctions.errorMessage(errMsg)); }); return false; }; - - $scope.toggleAdmin = function(user) { + + $scope.toggleAdmin = function (user) { if (user.adminChanging) return; - + user.adminChanging = true; $http.post('admin/save', {userId: user._id, adminFlag: user.admin}).success( @@ -58,8 +76,8 @@ controlCenterModule.controller('adminController', ['$scope', '$alert', '$http', reload(); adminChanging = false; - }).error(function (err) { - $scope.alertStr = "Failed to update user: " + err; + }).error(function (errMsg) { + $scope.showError("Failed to remove user: " + commonFunctions.errorMessage(errMsg)); adminChanging = false; }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87be5272/modules/web-control-center/nodejs/views/admin/userList.jade ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/views/admin/userList.jade b/modules/web-control-center/nodejs/views/admin/userList.jade index d3cd122..6a9f9b3 100644 --- a/modules/web-control-center/nodejs/views/admin/userList.jade +++ b/modules/web-control-center/nodejs/views/admin/userList.jade @@ -24,7 +24,6 @@ block container p List of registered users hr .docs-body - div(ng-class='{alert: true, "alert-danger": alertType == danger, "alert-success": alertType == "success"}' ng-show='alertStr') {{alertStr}} table.table.table-striped(st-table='userListDisplay' st-safe-src='userList') thead tr @@ -44,8 +43,8 @@ block container td span.small {{user.lastLogin | date:'medium'}} td - input(type='checkbox' ng-disabled='user.adminChanging' ng-model='user.admin' - ng-change='toggleAdmin(user)') + input(type='checkbox' ng-disabled='user.adminChanging || user._id == loggedInUser._id' + ng-model='user.admin' ng-change='toggleAdmin(user)') td(width='1%') a(ng-click='removeUser(user)' ng-show='user._id != loggedInUser._id' title='Remove user') span.glyphicon.glyphicon-remove(style='color: red')