External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-06 17:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-234 create organizaions via Projects Tab

Browse Source
This commit is contained in:
chouseknecht
2013-07-19 11:00:55 -04:00
parent 22e1a1ae72
commit 549ba9a150
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/static/js/app.js
View File

@@ -101,6 +101,9 @@ angular.module('ansible', [
when('/projects/:project_id/organizations', when('/projects/:project_id/organizations',
{ templateUrl: urlPrefix + 'partials/projects.html', controller: OrganizationsList }). { templateUrl: urlPrefix + 'partials/projects.html', controller: OrganizationsList }).
when('/projects/:project_id/organizations/add',
{ templateUrl: urlPrefix + 'partials/projects.html', controller: OrganizationsAdd }).
when('/inventories', when('/inventories',
{ templateUrl: urlPrefix + 'partials/inventories.html', controller: InventoriesList }). { templateUrl: urlPrefix + 'partials/inventories.html', controller: InventoriesList }).

14
awx/ui/static/js/controllers/Organizations.js
View File

@@ -138,6 +138,7 @@ function OrganizationsAdd ($scope, $rootScope, $compile, $location, $log, $route
// Inject dynamic view // Inject dynamic view
var form = GenerateForm; var form = GenerateForm;
var scope = form.inject(OrganizationForm, {mode: 'add', related: false}); var scope = form.inject(OrganizationForm, {mode: 'add', related: false});
var base = $location.path().replace(/^\//,'').split('/')[0];
var defaultUrl = GetBasePath('organizations'); var defaultUrl = GetBasePath('organizations');
form.reset(); form.reset();
@@ -145,12 +146,19 @@ function OrganizationsAdd ($scope, $rootScope, $compile, $location, $log, $route
// Save // Save
scope.formSave = function() { scope.formSave = function() {
Rest.setUrl(defaultUrl); var url = GetBasePath(base);
url += (base != 'organizations') ? $routeParams['project_id'] + '/organizations/' : '';
Rest.setUrl(url);
Rest.post({ name: $scope.name, Rest.post({ name: $scope.name,
description: $scope.description }) description: $scope.description })
.success( function(data, status, headers, config) { .success( function(data, status, headers, config) {
$rootScope.flashMessage = "New organization successfully created!"; if (base == 'organizations') {
$location.path('/organizations/' + data.id); $rootScope.flashMessage = "New organization successfully created!";
$location.path('/organizations/' + data.id);
}
else {
ReturnToCaller(1);
}
}) })
.error( function(data, status, headers, config) { .error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, OrganizationForm, ProcessErrors(scope, data, status, OrganizationForm,