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

Projects can now be added to a Team and created from the Team tab.

Browse Source
This commit is contained in:
chouseknecht
2013-05-23 11:52:45 -04:00
parent ab4115d0e7
commit 151f02e92c
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ansibleworks/ui/static/js/app.js
View File

@@ -168,6 +168,15 @@ angular.module('ansible', [
when('/teams/:team_id/users/:user_id', { templateUrl: urlPrefix + 'partials/teams.html', when('/teams/:team_id/users/:user_id', { templateUrl: urlPrefix + 'partials/teams.html',
controller: UsersEdit }). controller: UsersEdit }).
when('/teams/:team_id/projects', { templateUrl: urlPrefix + 'partials/teams.html',
controller: ProjectsList }).
when('/teams/:team_id/projects/add', { templateUrl: urlPrefix + 'partials/teams.html',
controller: ProjectsAdd }).
when('/teams/:team_id/projects/:project_id', { templateUrl: urlPrefix + 'partials/teams.html',
controller: ProjectsEdit }).
when('/teams/:team_id/credentials', { templateUrl: urlPrefix + 'partials/teams.html', when('/teams/:team_id/credentials', { templateUrl: urlPrefix + 'partials/teams.html',
controller: CredentialsList }). controller: CredentialsList }).

19
ansibleworks/ui/static/js/controllers/Projects.js
View File

@@ -20,8 +20,8 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
var defaultUrl = GetBasePath('projects'); var defaultUrl = GetBasePath('projects');
var view = GenerateList; var view = GenerateList;
var base = $location.path().replace(/^\//,'').split('/')[0]; var base = $location.path().replace(/^\//,'').split('/')[0];
var mode = (base == 'projects') ? 'edit' : 'select'; // if base path 'credentials', we're here to add/edit var mode = (base == 'projects') ? 'edit' : 'select';
var scope = view.inject(list, { mode: mode }); // Inject our view var scope = view.inject(list, { mode: mode });
scope.selected = []; scope.selected = [];
SearchInit({ scope: scope, set: 'projects', list: list, url: defaultUrl }); SearchInit({ scope: scope, set: 'projects', list: list, url: defaultUrl });
@@ -62,7 +62,8 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
} }
scope.finishSelection = function() { scope.finishSelection = function() {
Rest.setUrl(GetBasePath('projects')); var url = (base == 'teams') ? GetBasePath('teams') + $routeParams.team_id + '/projects/' : defaultUrl;
Rest.setUrl(url);
scope.queue = []; scope.queue = [];
if (scope.callFinishedRemove) { if (scope.callFinishedRemove) {
@@ -95,7 +96,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
for (var i=0; i < scope.selected.length; i++) { for (var i=0; i < scope.selected.length; i++) {
for (var j=0; j < scope.projects.length; j++) { for (var j=0; j < scope.projects.length; j++) {
if (scope.projects[j].id == scope.selected[i]) { if (scope.projects[j].id == scope.selected[i]) {
project = scope.credentials[j]; project = scope.projects[j];
} }
} }
if (project !== null) { if (project !== null) {
@@ -149,6 +150,7 @@ function ProjectsAdd ($scope, $rootScope, $compile, $location, $log, $routeParam
// Inject dynamic view // Inject dynamic view
var form = ProjectsForm; var form = ProjectsForm;
var generator = GenerateForm; var generator = GenerateForm;
var base = $location.path().replace(/^\//,'').split('/')[0];
var defaultUrl = GetBasePath('projects'); var defaultUrl = GetBasePath('projects');
var scope = generator.inject(form, {mode: 'add', related: false}); var scope = generator.inject(form, {mode: 'add', related: false});
var id = $routeParams.id; var id = $routeParams.id;
@@ -158,20 +160,19 @@ function ProjectsAdd ($scope, $rootScope, $compile, $location, $log, $routeParam
// Save // Save
scope.formSave = function() { scope.formSave = function() {
var data = {}; var data = {};
for (var fld in form.fields) { for (var fld in form.fields) {
data[fld] = scope[fld]; data[fld] = scope[fld];
} }
var url = (base == 'teams') ? GetBasePath('teams') + $routeParams.team_id + '/projects/' : defaultUrl;
Rest.setUrl(defaultUrl); Rest.setUrl(url);
Rest.post(data) Rest.post(data)
.success( function(data, status, headers, config) { .success( function(data, status, headers, config) {
ReturnToCaller(); (base == 'projects') ? ReturnToCaller() : ReturnToCaller(1);
}) })
.error( function(data, status, headers, config) { .error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, ProjectsForm, ProcessErrors(scope, data, status, ProjectsForm,
{ hdr: 'Error!', msg: 'Failed to add new project. Post returned status: ' + status }); { hdr: 'Error!', msg: 'Failed to create new project. Post returned status: ' + status });
}); });
}; };