mirror of
https://github.com/ansible/awx.git
synced 2026-03-07 11:41:08 -03:30
Initial restructuring of Job Detail code
To use our new modular approach to organizing code by feature
This commit is contained in:
@@ -31,6 +31,7 @@ import systemTracking from './system-tracking/main';
|
|||||||
import inventoryScripts from './inventory-scripts/main';
|
import inventoryScripts from './inventory-scripts/main';
|
||||||
import permissions from './permissions/main';
|
import permissions from './permissions/main';
|
||||||
import managementJobs from './management-jobs/main';
|
import managementJobs from './management-jobs/main';
|
||||||
|
import jobDetail from './job-detail/main';
|
||||||
|
|
||||||
// modules
|
// modules
|
||||||
import setupMenu from './setup-menu/main';
|
import setupMenu from './setup-menu/main';
|
||||||
@@ -43,7 +44,6 @@ import templateUrl from './shared/template-url/main';
|
|||||||
import adhoc from './adhoc/main';
|
import adhoc from './adhoc/main';
|
||||||
import login from './login/main';
|
import login from './login/main';
|
||||||
import activityStream from './activity-stream/main';
|
import activityStream from './activity-stream/main';
|
||||||
import {JobDetailController} from './controllers/JobDetail';
|
|
||||||
import {JobStdoutController} from './controllers/JobStdout';
|
import {JobStdoutController} from './controllers/JobStdout';
|
||||||
import {JobTemplatesList, JobTemplatesAdd, JobTemplatesEdit} from './controllers/JobTemplates';
|
import {JobTemplatesList, JobTemplatesAdd, JobTemplatesEdit} from './controllers/JobTemplates';
|
||||||
import {LicenseController} from './controllers/License';
|
import {LicenseController} from './controllers/License';
|
||||||
@@ -95,6 +95,7 @@ var tower = angular.module('Tower', [
|
|||||||
login.name,
|
login.name,
|
||||||
activityStream.name,
|
activityStream.name,
|
||||||
footer.name,
|
footer.name,
|
||||||
|
jobDetail.name,
|
||||||
'templates',
|
'templates',
|
||||||
'Utilities',
|
'Utilities',
|
||||||
'LicenseHelper',
|
'LicenseHelper',
|
||||||
@@ -293,33 +294,6 @@ var tower = angular.module('Tower', [
|
|||||||
}
|
}
|
||||||
}).
|
}).
|
||||||
|
|
||||||
state('jobDetail', {
|
|
||||||
url: '/jobs/:id',
|
|
||||||
templateUrl: urlPrefix + 'partials/job_detail.html',
|
|
||||||
controller: JobDetailController,
|
|
||||||
ncyBreadcrumb: {
|
|
||||||
parent: 'jobs',
|
|
||||||
label: "{{ job.id }} - {{ job.name }}"
|
|
||||||
},
|
|
||||||
resolve: {
|
|
||||||
features: ['FeaturesService', function(FeaturesService) {
|
|
||||||
return FeaturesService.get();
|
|
||||||
}],
|
|
||||||
jobEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
|
|
||||||
if (!$rootScope.event_socket) {
|
|
||||||
$rootScope.event_socket = Socket({
|
|
||||||
scope: $rootScope,
|
|
||||||
endpoint: "job_events"
|
|
||||||
});
|
|
||||||
$rootScope.event_socket.init();
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
}
|
|
||||||
}).
|
|
||||||
|
|
||||||
state('jobsStdout', {
|
state('jobsStdout', {
|
||||||
url: '/jobs/:id/stdout',
|
url: '/jobs/:id/stdout',
|
||||||
templateUrl: urlPrefix + 'partials/job_stdout.html',
|
templateUrl: urlPrefix + 'partials/job_stdout.html',
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
1452
awx/ui/client/src/job-detail/job-detail.controller.js
Normal file
1452
awx/ui/client/src/job-detail/job-detail.controller.js
Normal file
File diff suppressed because it is too large
Load Diff
0
awx/ui/client/src/job-detail/job-detail.factory.js
Normal file
0
awx/ui/client/src/job-detail/job-detail.factory.js
Normal file
35
awx/ui/client/src/job-detail/job-detail.route.js
Normal file
35
awx/ui/client/src/job-detail/job-detail.route.js
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
/*************************************************
|
||||||
|
* Copyright (c) 2015 Ansible, Inc.
|
||||||
|
*
|
||||||
|
* All Rights Reserved
|
||||||
|
*************************************************/
|
||||||
|
|
||||||
|
import {templateUrl} from '../shared/template-url/template-url.factory';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'jobDetail',
|
||||||
|
url: '/jobs/:id',
|
||||||
|
templateUrl: templateUrl('job-detail/job-detail'),
|
||||||
|
controller: 'JobDetailController',
|
||||||
|
ncyBreadcrumb: {
|
||||||
|
parent: 'jobs',
|
||||||
|
label: "{{ job.id }} - {{ job.name }}"
|
||||||
|
},
|
||||||
|
resolve: {
|
||||||
|
features: ['FeaturesService', function(FeaturesService) {
|
||||||
|
return FeaturesService.get();
|
||||||
|
}],
|
||||||
|
jobEventsSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
|
||||||
|
if (!$rootScope.event_socket) {
|
||||||
|
$rootScope.event_socket = Socket({
|
||||||
|
scope: $rootScope,
|
||||||
|
endpoint: "job_events"
|
||||||
|
});
|
||||||
|
$rootScope.event_socket.init();
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
};
|
||||||
15
awx/ui/client/src/job-detail/main.js
Normal file
15
awx/ui/client/src/job-detail/main.js
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
/*************************************************
|
||||||
|
* Copyright (c) 2016 Ansible, Inc.
|
||||||
|
*
|
||||||
|
* All Rights Reserved
|
||||||
|
*************************************************/
|
||||||
|
|
||||||
|
import route from './job-detail.route';
|
||||||
|
import controller from './job-detail.controller';
|
||||||
|
|
||||||
|
export default
|
||||||
|
angular.module('jobDetail', [])
|
||||||
|
.controller('JobDetailController', controller)
|
||||||
|
.run(['$stateExtender', function($stateExtender) {
|
||||||
|
$stateExtender.addState(route);
|
||||||
|
}]);
|
||||||
Reference in New Issue
Block a user