Merge branch 'bees' into koh
This commit is contained in:
commit
7bf96c506f
27 changed files with 277 additions and 41 deletions
|
@ -1757,6 +1757,12 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
|
|||
return notificationService;
|
||||
}]);
|
||||
|
||||
$provide.factory('OAuthService', ['$location', 'Config', function($location, Config) {
|
||||
var oauthService = {};
|
||||
oauthService.SCOPES = window.__auth_scopes;
|
||||
return oauthService;
|
||||
}]);
|
||||
|
||||
$provide.factory('KeyService', ['$location', 'Config', function($location, Config) {
|
||||
var keyService = {}
|
||||
var oauth = window.__oauth;
|
||||
|
|
|
@ -2696,12 +2696,28 @@ function OrgMemberLogsCtrl($scope, $routeParams, $rootScope, $timeout, Restangul
|
|||
}
|
||||
|
||||
|
||||
function ManageApplicationCtrl($scope, $routeParams, $rootScope, $location, $timeout, ApiService) {
|
||||
function ManageApplicationCtrl($scope, $routeParams, $rootScope, $location, $timeout, OAuthService, ApiService, UserService, Config) {
|
||||
var orgname = $routeParams.orgname;
|
||||
var clientId = $routeParams.clientid;
|
||||
|
||||
$scope.Config = Config;
|
||||
$scope.OAuthService = OAuthService;
|
||||
$scope.updating = false;
|
||||
|
||||
$scope.genScopes = {};
|
||||
|
||||
UserService.updateUserIn($scope);
|
||||
|
||||
$scope.getScopes = function(scopes) {
|
||||
var checked = [];
|
||||
for (var scopeName in scopes) {
|
||||
if (scopes.hasOwnProperty(scopeName) && scopes[scopeName]) {
|
||||
checked.push(scopeName);
|
||||
}
|
||||
}
|
||||
return checked;
|
||||
};
|
||||
|
||||
$scope.askResetClientSecret = function() {
|
||||
$('#resetSecretModal').modal({});
|
||||
};
|
||||
|
|
Reference in a new issue