From 8f007a70db6ab8df36f70a668a628c4f099dc8ee Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 6 Apr 2017 11:00:53 -0400 Subject: [PATCH] dropdown options and iconography for subvaults --- .../organizationSubvaultsController.js | 1 + .../organizationSubvaultsUsersController.js | 2 ++ .../views/organizationPeople.html | 5 ++++ .../views/organizationSubvaultsUsers.html | 25 +++++++++++-------- src/app/vault/views/vault.html | 4 +-- src/app/vault/views/vaultSubvaults.html | 2 +- 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/app/organization/organizationSubvaultsController.js b/src/app/organization/organizationSubvaultsController.js index 0eeb8a40c4..8fca4ee1f0 100644 --- a/src/app/organization/organizationSubvaultsController.js +++ b/src/app/organization/organizationSubvaultsController.js @@ -45,6 +45,7 @@ templateUrl: 'app/organization/views/organizationSubvaultsUsers.html', controller: 'organizationSubvaultsUsersController', size: 'lg', + windowClass: 'organizationSubvaultsUsersModal', resolve: { subvault: function () { return subvault; } } diff --git a/src/app/organization/organizationSubvaultsUsersController.js b/src/app/organization/organizationSubvaultsUsersController.js index 959e2ed180..55f14166ef 100644 --- a/src/app/organization/organizationSubvaultsUsersController.js +++ b/src/app/organization/organizationSubvaultsUsersController.js @@ -8,6 +8,8 @@ $scope.users = []; $uibModalInstance.opened.then(function () { + $scope.modalWindow = angular.element(document).find('.organizationSubvaultsUsersModal'); + $scope.loading = false; apiService.subvaultUsers.listSubvault( { diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html index 8fb093016a..e9d2276f8c 100644 --- a/src/app/organization/views/organizationPeople.html +++ b/src/app/organization/views/organizationPeople.html @@ -39,6 +39,11 @@