Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cluster summary users #468

Merged
merged 16 commits into from
Jul 20, 2016
Merged

Cluster summary users #468

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b4fca91
TEAMFOUR-698 WIP
Jul 8, 2016
cebb3bb
Service for userinfo
Jul 11, 2016
7f18bdf
WIP
Jul 11, 2016
9654956
WIP
Jul 12, 2016
304b9e3
Better column sizes
Jul 12, 2016
3de6ea3
Minor tidy-ups
Jul 12, 2016
e3be0a7
Disable actions until implemented
Jul 12, 2016
4f755b6
WIP
Jul 13, 2016
f69727a
Finally got rid of misleading col-md-* classes
Jul 13, 2016
5ccd283
Merged master
Jul 13, 2016
dce0740
Fix lint errors in APIs
Jul 13, 2016
3ad654b
Removed debug output
Jul 13, 2016
a39cfd3
lint
Jul 13, 2016
60c1be6
Merge branch 'master' into cluster-summary-users
Jul 18, 2016
96284f3
TEAMFOUR-698, TEAMFOUR-699
Jul 19, 2016
3099564
Removed left-over isAdmin debug code
Jul 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lint
  • Loading branch information
Julien Bramary committed Jul 13, 2016
commit a39cfd3314dd7321217eb5adc4d2c045af040fcd
2 changes: 2 additions & 0 deletions src/app/model/navigation/navigation.model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
* @param {app.event.eventService} eventService - the event bus service
* @param {object} $state - ui-router $state service
* @param {object} $rootScope - Angular rootScope object
* @param {object} $log - angular log service
* @property {app.event.eventService} eventService - the event bus service
* @property {object} $state - ui-router $state service
* @property {app.model.navigation} menu - the navigation model
Expand Down Expand Up @@ -110,6 +111,7 @@
* @namespace app.model.navigation.Menu
* @memberof app.model.navigation
* @name app.model.navigation.Menu
* @param {object} $log - angular log service
* @property {string} currentState - current ui-router state
*/
function Menu($log) {
Expand Down
8 changes: 4 additions & 4 deletions src/app/view/endpoints/clusters/cluster/detail/cluster-detail.users.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@

ClusterUsersController.$inject = [
'app.model.modelManager',
'$stateParams'
'$stateParams',
'$log'
];

function ClusterUsersController(modelManager, $stateParams) {
var that = this;
function ClusterUsersController(modelManager, $stateParams, $log) {
this.guid = $stateParams.guid;
this.usersModel = modelManager.retrieve('cloud-foundry.model.users');
this.usersModel.listAllUsers(this.guid, {}).then(function (res) {
console.log('Received list of Users: ', res);
$log.debug('Received list of Users: ', res);
});
}

Expand Down
3 changes: 2 additions & 1 deletion ...p/view/endpoints/clusters/cluster/detail/organization-tile/organization-tile.directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
* @name OrganizationTileController
* @constructor
* @param {object} $state - the angular $state service
* @param {object} utils - our utils service
* @property {Array} actions - collection of relevant actions that can be executed against cluster
*/
function OrganizationTileController($state, utils) {
Expand Down Expand Up @@ -64,7 +65,7 @@
} else {
// If there are more than one role, don't show the user role
if (roles.length > 1) {
_.remove(roles, function(role) {
_.remove(roles, function (role) {
return role === 'org_user';
});
}
Expand Down
17 changes: 11 additions & 6 deletions src/plugins/cloud-foundry/model/organization/organization.model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,16 @@
/**
* @memberof cloud-foundry.model
* @name Organization
* @param {app.api.apiManager} apiManager - the API manager
* @property {app.api.apiManager} apiManager - the API manager
* @param {app.api.apiManager} apiManager - the API manager
* @property {app.api.apiManager} apiManager - the API manager
* @param {object} apiManager - the API manager
* @property {object} apiManager - the API manager
* @param {object} utils - the utils service
* @property {object} utils - the utils service
* @param {object} userInfoService - the userInfoService service
* @property {object} userInfoService - the userInfoService service
* @param {object} $q - angular $q service
* @property {object} $q - angular $q service
* @param {object} $log - angular $log service
* @property {object} $log - angular $log service
* @class
*/
function Organization(apiManager, utils, userInfoService, $q, $log) {
Expand Down Expand Up @@ -117,7 +123,7 @@
var rolesP = orgsApi.RetrievingRolesOfAllUsersInOrganization(orgGuid, params, httpConfig);
var userInfoP = that.userInfoService.userInfo();

var orgRolesP = that.$q.all({roles: rolesP, userInfo: userInfoP}).then(function(values) {
var orgRolesP = that.$q.all({roles: rolesP, userInfo: userInfoP}).then(function (values) {
var i, userGuid, myRoles;

// Find our user's GUID
Expand Down Expand Up @@ -146,7 +152,6 @@
return myRoles;
});


var appCountsP = this.apiManager.retrieve('cloud-foundry.api.Organizations')
.ListAllSpacesForOrganization(orgGuid, params, httpConfig).then(function (res) {
var spaces = res.data.resources;
Expand Down