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

fix instance groups sub jobs lists

Browse Source
This commit is contained in:
John Mitchell 2018-03-23 17:00:41 -04:00
parent babad0b868
commit f3329c8cce
No known key found for this signature in database
GPG Key ID: FE6A9B5BD4EB5C94
8 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/features/jobs/routes/instanceGroupJobs.route.js
View File

@ -1,9 +1,9 @@
import listContainerController from '~src/instance-groups/jobs/jobsListContainer.controller';
import listContainerController from '~src/instance-groups/jobs/instanceGroupsJobsListContainer.controller';
import { N_ } from '../../../src/i18n';
import jobsListController from '../jobsList.controller';
const jobsListTemplate = require('~features/jobs/jobsList.view.html');
const listContainerTemplate = require('~src/instance-groups/jobs/jobsListContainer.partial.html');
const listContainerTemplate = require('~src/instance-groups/jobs/instanceGroupsJobsListContainer.partial.html');
export default {
name: 'instanceGroups.jobs',
@ -22,12 +22,12 @@ export default {
}
},
views: {
'jobsContainer@instanceGroups': {
'instanceGroupsJobsContainer@instanceGroups': {
templateUrl: listContainerTemplate,
controller: listContainerController,
controllerAs: 'vm'
},
'jobsList@instanceGroups': {
'jobsList@instanceGroups.jobs': {
templateUrl: jobsListTemplate,
controller: jobsListController,
controllerAs: 'vm'

10
awx/ui/client/features/jobs/routes/instanceJobs.route.js
View File

@ -1,24 +1,24 @@
import listContainerController from '~src/instance-groups/jobs/jobsListContainer.controller';
import listContainerController from '~src/instance-groups/jobs/instanceJobsListContainer.controller';
import { N_ } from '../../../src/i18n';
import jobsListController from '../jobsList.controller';
const jobsListTemplate = require('~features/jobs/jobsList.view.html');
const listContainerTemplate = require('~src/instance-groups/jobs/jobsListContainer.partial.html');
const listContainerTemplate = require('~src/instance-groups/jobs/instanceJobsListContainer.partial.html');
export default {
name: 'instanceGroups.instanceJobs',
url: '/:instance_group_id/instances/:instance_id/jobs',
ncyBreadcrumb: {
parent: 'instanceGroups.instances',
parent: 'instanceGroups.edit',
label: N_('JOBS')
},
views: {
'jobsContainer@instances': {
'instanceJobsContainer@instanceGroups': {
templateUrl: listContainerTemplate,
controller: listContainerController,
controllerAs: 'vm'
},
'jobsList@instances': {
'jobsList@instanceGroups.instanceJobs': {
templateUrl: jobsListTemplate,
controller: jobsListController,
controllerAs: 'vm'

6
awx/ui/client/lib/components/tabs/_index.less
View File

@ -29,4 +29,8 @@
.at-TabGroup + .at-Panel-body {
margin-top: 20px;
}
}
.at-TabGroup--padBelow {
margin-bottom: 20px;
}

4
awx/ui/client/src/instance-groups/instance-groups.partial.html
View File

@ -7,7 +7,9 @@
<div ui-view="instances"></div>
<div ui-view="jobsContainer"></div>
<div ui-view="instanceJobsContainer"></div>
<div ui-view="instanceGroupsJobsContainer"></div>
<div ui-view="list"></div>
</div>

6
awx/ui/client/src/instance-groups/jobs/jobsListContainer.controller.js → awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.controller.js
View File

@ -7,20 +7,22 @@ function InstanceGroupJobsContainerController (strings, $state) {
const instanceGroupId = $state.params.instance_group_id;
vm.panelTitle = 'Jobs'
vm.strings = strings;
vm.tab = {
details: {
_go: 'instanceGroups.edit',
_params: { instanceGroupId },
_params: { instance_group_id: instanceGroupId },
_label: strings.get('tab.DETAILS')
},
instances: {
_go: 'instanceGroups.instances',
_params: { instanceGroupId },
_params: { instance_group_id: instanceGroupId },
_label: strings.get('tab.INSTANCES')
},
jobs: {
_active: true,
_params: { instance_group_id: instanceGroupId },
_label: strings.get('tab.JOBS')
}
};

2
awx/ui/client/src/instance-groups/jobs/jobsListContainer.partial.html → awx/ui/client/src/instance-groups/jobs/instanceGroupsJobsListContainer.partial.html
View File

@ -2,7 +2,7 @@
<at-panel-heading>
{{ vm.panelTitle }}
</at-panel-heading>
<at-tab-group>
<at-tab-group class="at-TabGroup--padBelow">
<at-tab state="vm.tab.details">{{:: vm.strings.get('tab.DETAILS') }}</at-tab>
<at-tab state="vm.tab.instances">{{:: vm.strings.get('tab.INSTANCES') }}</at-tab>
<at-tab state="vm.tab.jobs">{{:: vm.strings.get('tab.JOBS') }}</at-tab>

20
awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.controller.js Normal file
View File

@ -0,0 +1,20 @@
function InstanceGroupJobsContainerController (strings, $state) {
const vm = this || {};
init();
function init() {
const instanceGroupId = $state.params.instance_group_id;
vm.panelTitle = 'Jobs'
vm.strings = strings;
}
}
InstanceGroupJobsContainerController.$inject = [
'InstanceGroupsStrings',
'$state'
];
export default InstanceGroupJobsContainerController;

6
awx/ui/client/src/instance-groups/jobs/instanceJobsListContainer.partial.html Normal file
View File

@ -0,0 +1,6 @@
<at-panel>
<at-panel-heading>
{{ vm.panelTitle }}
</at-panel-heading>
<div ui-view="jobsList"></div>
</at-panel>