External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-21 13:10:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

deduping options request and possibly fixing choices of undefined error

Browse Source
This commit is contained in:
John Mitchell
2017-04-25 18:13:05 -04:00
parent 38c0c0a89b
commit 2b57027067
18 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/ui/client/src/credential-types/list/list.controller.js
View File

@@ -24,8 +24,10 @@ export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList',
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd("credential_types") rbacUiControlService.canAdd("credential_types")
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
$scope.options = params.options;
optionsRequestDataProcessing();
}); });
// search init // search init
@@ -93,7 +95,7 @@ export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList',
// Set the item type label // Set the item type label
if (list.fields.kind && $scope.options && if (list.fields.kind && $scope.options &&
$scope.options.hasOwnProperty('kind')) { $scope.options.kind) {
$scope.options.kind.choices.forEach(function(choice) { $scope.options.kind.choices.forEach(function(choice) {
if (choice[0] === item.kind) { if (choice[0] === item.kind) {
itm.kind_label = choice[1]; itm.kind_label = choice[1];
@@ -106,13 +108,6 @@ export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList',
} }
} }
Rest.setUrl(GetBasePath("credential_types"));
Rest.options()
.success(function(data) {
$scope.options = data.actions.GET;
optionsRequestDataProcessing();
});
$scope.$watchCollection(`${$scope.list.name}`, function() { $scope.$watchCollection(`${$scope.list.name}`, function() {
optionsRequestDataProcessing(); optionsRequestDataProcessing();
} }

4
awx/ui/client/src/credentials/list/credentials-list.controller.js
View File

@@ -19,8 +19,8 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ClearScope',
function init() { function init() {
rbacUiControlService.canAdd('credentials') rbacUiControlService.canAdd('credentials')
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
// search init // search init

4
awx/ui/client/src/inventories/add/inventory-add.controller.js
View File

@@ -17,8 +17,8 @@ function InventoriesAdd($scope, $location,
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd(GetBasePath('inventory')) rbacUiControlService.canAdd(GetBasePath('inventory'))
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
Rest.setUrl(GetBasePath('inventory')); Rest.setUrl(GetBasePath('inventory'));

6
awx/ui/client/src/inventories/list/inventory-list.controller.js
View File

@@ -23,8 +23,8 @@ function InventoriesList($scope, $rootScope, $location,
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd('inventory') rbacUiControlService.canAdd('inventory')
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
$scope.$watchCollection(list.name, function(){ $scope.$watchCollection(list.name, function(){
@@ -102,7 +102,7 @@ function InventoriesList($scope, $rootScope, $location,
elem.removeAttr('ng-click'); elem.removeAttr('ng-click');
$compile(elem)($scope); $compile(elem)($scope);
$scope.triggerPopover(event); $scope.triggerPopover(event);
} }
if ($scope.removeHostSummaryReady) { if ($scope.removeHostSummaryReady) {
$scope.removeHostSummaryReady(); $scope.removeHostSummaryReady();
} }

4
awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
View File

@@ -17,8 +17,8 @@ export default ['$state', '$stateParams', '$scope', 'GroupForm', 'ParseTypeChang
GenerateForm.applyDefaults(form, $scope); GenerateForm.applyDefaults(form, $scope);
rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/groups") rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/groups")
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';
$scope.envParseType = 'yaml'; $scope.envParseType = 'yaml';

4
awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
View File

@@ -13,8 +13,8 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString', 'rbac
function init() { function init() {
rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/groups") rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/groups")
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
// instantiate expected $scope values from inventorySourceData & groupData // instantiate expected $scope values from inventorySourceData & groupData
_.assign($scope, { credential: inventorySourceData.credential }, { overwrite: inventorySourceData.overwrite }, { overwrite_vars: inventorySourceData.overwrite_vars }, { update_on_launch: inventorySourceData.update_on_launch }, { update_cache_timeout: inventorySourceData.update_cache_timeout }, { instance_filters: inventorySourceData.instance_filters }, { inventory_script: inventorySourceData.source_script }); _.assign($scope, { credential: inventorySourceData.credential }, { overwrite: inventorySourceData.overwrite }, { overwrite_vars: inventorySourceData.overwrite_vars }, { update_on_launch: inventorySourceData.update_on_launch }, { update_cache_timeout: inventorySourceData.update_cache_timeout }, { instance_filters: inventorySourceData.instance_filters }, { inventory_script: inventorySourceData.source_script });

4
awx/ui/client/src/inventories/manage/groups/groups-list.controller.js
View File

@@ -21,8 +21,8 @@
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd(GetBasePath('inventory') + $scope.inventory_id + "/groups") rbacUiControlService.canAdd(GetBasePath('inventory') + $scope.inventory_id + "/groups")
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
// Search init // Search init

4
awx/ui/client/src/inventories/manage/hosts/hosts-add.controller.js
View File

@@ -15,8 +15,8 @@ export default ['$state', '$stateParams', '$scope', 'HostForm', 'ParseTypeChange
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/hosts") rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/hosts")
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';
$scope.host = { enabled: true }; $scope.host = { enabled: true };

4
awx/ui/client/src/inventories/manage/hosts/hosts-list.controller.js
View File

@@ -17,8 +17,8 @@
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd(GetBasePath('inventory') + $scope.inventory_id + "/hosts") rbacUiControlService.canAdd(GetBasePath('inventory') + $scope.inventory_id + "/hosts")
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
// Search init // Search init

4
awx/ui/client/src/inventory-scripts/list/list.controller.js
View File

@@ -19,8 +19,8 @@ export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList',
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd("inventory_scripts") rbacUiControlService.canAdd("inventory_scripts")
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
// search init // search init

4
awx/ui/client/src/notifications/notification-templates-list/list.controller.js
View File

@@ -23,8 +23,8 @@
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd("notification_templates") rbacUiControlService.canAdd("notification_templates")
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
// search init // search init

4
awx/ui/client/src/organizations/list/organizations-list.controller.js
View File

@@ -23,8 +23,8 @@ export default ['$stateParams', '$scope', '$rootScope',
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd("organizations") rbacUiControlService.canAdd("organizations")
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
$scope.orgCount = Dataset.data.count; $scope.orgCount = Dataset.data.count;

4
awx/ui/client/src/projects/list/projects-list.controller.js
View File

@@ -22,8 +22,8 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd('projects') rbacUiControlService.canAdd('projects')
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
// search init // search init

4
awx/ui/client/src/scheduler/schedulerList.controller.js
View File

@@ -34,8 +34,8 @@ export default [
scheduleEndpoint = ParentObject.endpoint|| ParentObject.related.schedules || `${ParentObject.related.inventory_source}schedules`; scheduleEndpoint = ParentObject.endpoint|| ParentObject.related.schedules || `${ParentObject.related.inventory_source}schedules`;
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd(scheduleEndpoint) rbacUiControlService.canAdd(scheduleEndpoint)
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
} }

2
awx/ui/client/src/shared/rbacUiControl.js
View File

@@ -20,7 +20,7 @@ export default
Rest.options() Rest.options()
.success(function(data) { .success(function(data) {
if (data.actions.POST) { if (data.actions.POST) {
canAddVal.resolve(true); canAddVal.resolve({canAdd: true, options: data});
} else { } else {
canAddVal.reject(false); canAddVal.reject(false);
} }

4
awx/ui/client/src/teams/list/teams-list.controller.js
View File

@@ -21,8 +21,8 @@ export default ['$scope', 'Rest', 'TeamList', 'Prompt', 'ClearScope',
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd('teams') rbacUiControlService.canAdd('teams')
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
// search init // search init
$scope.list = list; $scope.list = list;

8
awx/ui/client/src/templates/list/templates-list.controller.js
View File

@@ -25,13 +25,13 @@ export default ['$scope', '$rootScope',
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd("job_templates") rbacUiControlService.canAdd("job_templates")
.then(function(canAddJobTemplate) { .then(function(params) {
$scope.canAddJobTemplate = canAddJobTemplate; $scope.canAddJobTemplate = params.canAdd;
}); });
rbacUiControlService.canAdd("workflow_job_templates") rbacUiControlService.canAdd("workflow_job_templates")
.then(function(canAddWorkflowJobTemplate) { .then(function(params) {
$scope.canAddWorkflowJobTemplate = canAddWorkflowJobTemplate; $scope.canAddWorkflowJobTemplate = params.canAdd;
}); });
// search init // search init
$scope.list = list; $scope.list = list;

4
awx/ui/client/src/users/list/users-list.controller.js
View File

@@ -34,8 +34,8 @@ export default ['$scope', '$rootScope', 'Rest', 'UserList', 'Prompt',
$scope.canAdd = false; $scope.canAdd = false;
rbacUiControlService.canAdd('users') rbacUiControlService.canAdd('users')
.then(function(canAdd) { .then(function(params) {
$scope.canAdd = canAdd; $scope.canAdd = params.canAdd;
}); });
// search init // search init