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

Merge pull request #5605 from jlmitch5/cleanupProjects

Browse Source 
Cleanup projects
This commit is contained in:
jlmitch5 2017-03-14 15:56:09 -04:00 committed by GitHub
commit 1c266b6ab5
9 changed files with 42 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/app.js
View File

@ -145,9 +145,6 @@ var tower = angular.module('Tower', [
'TemplatesListDefinition',
'PortalJobTemplatesListDefinition',
'JobTemplateFormDefinition',
'ProjectsListDefinition',
'ProjectFormDefinition',
'ProjectStatusDefinition',
'CompletedJobsDefinition',
'AllJobsDefinition',
'JobSummaryDefinition',
@ -159,7 +156,6 @@ var tower = angular.module('Tower', [
//'Timezones',
'JobsListDefinition',
'LogViewerStatusDefinition',
'StandardOutHelper',
'LogViewerOptionsDefinition',
'lrInfiniteScroll',
'PortalJobsListDefinition',

4
awx/ui/client/src/forms.js
View File

@ -19,8 +19,6 @@ import JobVarsPrompt from "./forms/JobVarsPrompt";
import LogViewerOptions from "./forms/LogViewerOptions";
import LogViewerStatus from "./forms/LogViewerStatus";
import Organizations from "./forms/Organizations";
import ProjectStatus from "./forms/ProjectStatus";
import Projects from "./forms/Projects";
import Teams from "./forms/Teams";
import Users from "./forms/Users";
import WorkflowMaker from "./forms/WorkflowMaker";
@ -43,8 +41,6 @@ export
LogViewerOptions,
LogViewerStatus,
Organizations,
ProjectStatus,
Projects,
Teams,
Users,
WorkflowMaker,

2
awx/ui/client/src/lists.js
View File

@ -20,7 +20,6 @@ import Jobs from "./lists/Jobs";
import Organizations from "./lists/Organizations";
import PortalJobTemplates from "./lists/PortalJobTemplates";
import PortalJobs from "./lists/PortalJobs";
import Projects from "./lists/Projects";
import ScheduledJobs from "./lists/ScheduledJobs";
import Schedules from "./lists/Schedules";
import Streams from "./lists/Streams";
@ -45,7 +44,6 @@ export
Organizations,
PortalJobTemplates,
PortalJobs,
Projects,
ScheduledJobs,
Schedules,
Streams,

10
awx/ui/client/src/projects/add/projects-add.controller.js
View File

@ -4,12 +4,12 @@
* All Rights Reserved
*************************************************/
export default ['$scope', '$rootScope', '$compile', '$location', '$log',
'$stateParams', 'GenerateForm', 'ProjectsForm', 'Rest', 'Alert', 'ProcessErrors', 'GetBasePath',
export default ['$scope', '$location', '$stateParams', 'GenerateForm',
'ProjectsForm', 'Rest', 'Alert', 'ProcessErrors', 'GetBasePath',
'GetProjectPath', 'GetChoices', 'Wait', '$state', 'CreateSelect2', 'i18n',
function($scope, $rootScope, $compile, $location, $log,
$stateParams, GenerateForm, ProjectsForm, Rest, Alert, ProcessErrors,
GetBasePath, GetProjectPath, GetChoices, Wait, $state, CreateSelect2, i18n) {
function($scope, $location, $stateParams, GenerateForm, ProjectsForm, Rest,
Alert, ProcessErrors, GetBasePath, GetProjectPath, GetChoices, Wait, $state,
CreateSelect2, i18n) {
var form = ProjectsForm(),
base = $location.path().replace(/^\//, '').split('/')[0],

17
awx/ui/client/src/projects/edit/projects-edit.controller.js
View File

@ -4,14 +4,15 @@
* All Rights Reserved
*************************************************/
export default ['$scope', '$rootScope', '$compile', '$location', '$log',
'$stateParams', 'ProjectsForm', 'Rest', 'Alert', 'ProcessErrors', 'GenerateForm',
'Prompt', 'ClearScope', 'GetBasePath', 'GetProjectPath', 'Authorization', 'GetChoices', 'Empty',
'DebugForm', 'Wait', 'ProjectUpdate', '$state', 'CreateSelect2', 'ToggleNotification', 'i18n',
function($scope, $rootScope, $compile, $location, $log,
$stateParams, ProjectsForm, Rest, Alert, ProcessErrors, GenerateForm,
Prompt, ClearScope, GetBasePath, GetProjectPath, Authorization,
GetChoices, Empty, DebugForm, Wait, ProjectUpdate, $state, CreateSelect2, ToggleNotification, i18n) {
export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
'Alert', 'ProcessErrors', 'GenerateForm', 'Prompt', 'ClearScope',
'GetBasePath', 'GetProjectPath', 'Authorization', 'GetChoices', 'Empty',
'Wait', 'ProjectUpdate', '$state', 'CreateSelect2', 'ToggleNotification',
'i18n',
function($scope, $rootScope, $stateParams, ProjectsForm, Rest, Alert,
ProcessErrors, GenerateForm, Prompt, ClearScope, GetBasePath,
GetProjectPath, Authorization, GetChoices, Empty, Wait, ProjectUpdate,
$state, CreateSelect2, ToggleNotification, i18n) {
ClearScope('htmlTemplate');

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

@ -4,14 +4,14 @@
* All Rights Reserved
*************************************************/
export default ['$scope', '$rootScope', '$location', '$log', '$stateParams',
'Rest', 'Alert', 'ProjectList', 'Prompt', 'ReturnToCaller', 'ClearScope', 'ProcessErrors',
'GetBasePath', 'ProjectUpdate', 'Wait', 'GetChoices', 'Empty', 'Find', 'GetProjectIcon',
'GetProjectToolTip', '$filter', '$state', 'rbacUiControlService', 'Dataset', 'i18n', 'QuerySet',
function($scope, $rootScope, $location, $log, $stateParams,
Rest, Alert, ProjectList, Prompt, ReturnToCaller, ClearScope, ProcessErrors,
GetBasePath, ProjectUpdate, Wait, GetChoices, Empty, Find, GetProjectIcon,
GetProjectToolTip, $filter, $state, rbacUiControlService, Dataset, i18n, qs) {
export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert',
'ProjectList', 'Prompt', 'ProcessErrors', 'GetBasePath', 'ProjectUpdate',
'Wait', 'Empty', 'Find', 'GetProjectIcon', 'GetProjectToolTip', '$filter',
'$state', 'rbacUiControlService', 'Dataset', 'i18n', 'QuerySet',
function($scope, $rootScope, $log, $stateParams,Rest, Alert, ProjectList,
Prompt, ProcessErrors, GetBasePath, ProjectUpdate, Wait, Empty, Find,
GetProjectIcon, GetProjectToolTip, $filter, $state, rbacUiControlService,
Dataset, i18n, qs) {
var list = ProjectList,
defaultUrl = GetBasePath('projects');

4
awx/ui/client/src/projects/main.js
View File

@ -7,6 +7,8 @@
import ProjectsList from './list/projects-list.controller';
import ProjectsAdd from './add/projects-add.controller';
import ProjectsEdit from './edit/projects-edit.controller';
import ProjectList from './projects.list';
import ProjectsForm from './projects.form';
import { N_ } from '../i18n';
import GetProjectPath from './factories/get-project-path.factory';
import GetProjectIcon from './factories/get-project-icon.factory';
@ -20,6 +22,8 @@ angular.module('Projects', [])
.factory('GetProjectPath', GetProjectPath)
.factory('GetProjectIcon', GetProjectIcon)
.factory('GetProjectToolTip', GetProjectToolTip)
.factory('ProjectList', ProjectList)
.factory('ProjectsForm', ProjectsForm)
.config(['$stateProvider', 'stateDefinitionsProvider',
function($stateProvider, stateDefinitionsProvider) {
let stateDefinitions = stateDefinitionsProvider.$get();

32
awx/ui/client/src/forms/Projects.js → awx/ui/client/src/projects/projects.form.js
View File

@ -10,10 +10,9 @@
* @description This form is for adding/editing projects
*/
export default
angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
.factory('ProjectsFormObject', ['i18n', function(i18n) {
return {
export default ['i18n', 'NotificationsList', function(i18n, NotificationsList) {
return function() {
var projectsFormObj = {
addTitle: i18n._('NEW PROJECT'),
editTitle: '{{ name }}',
@ -266,18 +265,15 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
}
}
};}])
};
.factory('ProjectsForm', ['ProjectsFormObject', 'NotificationsList',
function(ProjectsFormObject, NotificationsList) {
return function() {
var itm;
for (itm in ProjectsFormObject.related) {
if (ProjectsFormObject.related[itm].include === "NotificationsList") {
ProjectsFormObject.related[itm] = NotificationsList;
ProjectsFormObject.related[itm].generateList = true; // tell form generator to call list generator and inject a list
}
}
return ProjectsFormObject;
};
}]);
var itm;
for (itm in projectsFormObj.related) {
if (projectsFormObj.related[itm].include === "NotificationsList") {
projectsFormObj.related[itm] = NotificationsList;
projectsFormObj.related[itm].generateList = true; // tell form generator to call list generator and inject a list
}
}
return projectsFormObj;
};}];

6
awx/ui/client/src/lists/Projects.js → awx/ui/client/src/projects/projects.list.js
View File

@ -4,9 +4,7 @@
* All Rights Reserved
*************************************************/
export default
angular.module('ProjectsListDefinition', [])
.factory('ProjectList', ['i18n', function(i18n) {
export default ['i18n', function(i18n) {
return {
name: 'projects',
@ -124,4 +122,4 @@ export default
dataPlacement: 'top'
}
}
};}]);
};}];