You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/08/25 16:05:23 UTC
[04/26] usergrid git commit: Don't show disabled admins in the portal.
Don't show disabled admins in the portal.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1fa5d101
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1fa5d101
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1fa5d101
Branch: refs/heads/asf-site
Commit: 1fa5d1015fa899fa248d6ea2b081c5628cc994c1
Parents: 2547ee8
Author: Michael Russo <mi...@gmail.com>
Authored: Thu Jul 30 15:02:09 2015 -0700
Committer: Michael Russo <mi...@gmail.com>
Committed: Thu Jul 30 15:02:09 2015 -0700
----------------------------------------------------------------------
portal/bower.json | 2 +-
portal/js/global/ug-service.js | 16 ++++++++++++++--
portal/package.json | 2 +-
3 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fa5d101/portal/bower.json
----------------------------------------------------------------------
diff --git a/portal/bower.json b/portal/bower.json
index 2a221cb..3c4784c 100644
--- a/portal/bower.json
+++ b/portal/bower.json
@@ -1,6 +1,6 @@
{
"name": "usergrid-portal",
- "version": "2.0.16",
+ "version": "2.0.17",
"ignore": [
".jshintrc",
"**/*.txt",
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fa5d101/portal/js/global/ug-service.js
----------------------------------------------------------------------
diff --git a/portal/js/global/ug-service.js b/portal/js/global/ug-service.js
index 9eed13a..1ec8558 100644
--- a/portal/js/global/ug-service.js
+++ b/portal/js/global/ug-service.js
@@ -221,7 +221,13 @@ AppServices.Services.factory('ug', function (configuration, $rootScope,utility,
if (err) {
$rootScope.$broadcast('alert', 'error', 'error getting administrators');
}
- $rootScope.$broadcast('administrators-received', administrators);
+ var enabledAdmins = [];
+ for(var i=0; i<administrators.length; i++){
+ if(administrators[i].disabled === false){
+ enabledAdmins.push(administrators[i]);
+ }
+ }
+ $rootScope.$broadcast('administrators-received', enabledAdmins);
});
},
createApplication: function (appName) {
@@ -239,7 +245,13 @@ AppServices.Services.factory('ug', function (configuration, $rootScope,utility,
if (err) {
$rootScope.$broadcast('alert', 'error', 'error creating administrator');
}
- $rootScope.$broadcast('administrators-received', administrators);
+ var enabledAdmins = [];
+ for(var i=0; i<administrators.length; i++){
+ if(administrators[i].disabled === false){
+ enabledAdmins.push(administrators[i]);
+ }
+ }
+ $rootScope.$broadcast('administrators-received', enabledAdmins);
});
},
getFeed: function () {
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fa5d101/portal/package.json
----------------------------------------------------------------------
diff --git a/portal/package.json b/portal/package.json
index 3829983..38d6455 100644
--- a/portal/package.json
+++ b/portal/package.json
@@ -1,6 +1,6 @@
{
"name": "usergrid",
- "version": "2.0.16",
+ "version": "2.0.17",
"packageName": "appsvc-ui",
"description": "full usergrid portal",
"main": "./scripts/web-server.js",