zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-28 02:41:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

rename to slicing and schema tweaks

Browse Source
This commit is contained in:
AlanCoding
2018-10-15 16:10:55 -04:00
parent 46d6dce738
commit bbd3edba47
26 changed files with 193 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui/client/features/jobs/jobsList.controller.js
View File

@@ -76,20 +76,12 @@ function ListJobsController (
return { icon, link, value };
});
vm.getSplitJobDetails = (details) => {
const internalLimitDetails = Object.assign({}, details);
if (!internalLimitDetails) {
vm.getSliceJobDetails = (job) => {
if (job.job_slice_count === 1) {
return null;
}
const splitJobDetails = internalLimitDetails.split;
if (!splitJobDetails) {
return null;
}
return `Split Job ${splitJobDetails.offset + 1}/${splitJobDetails.step}`;
return `Slice Job ${job.job_slice_number}/${job.job_slice_count}`;
};
vm.getSref = ({ type, id }) => {

2
awx/ui/client/features/jobs/jobsList.view.html
View File

@@ -24,7 +24,7 @@
header-value="{{ job.id }} - {{ job.name }}"
header-state="{{ vm.getSref(job) }}"
header-tag="{{ vm.jobTypes[job.type] }}"
secondary-tag="{{ vm.getSplitJobDetails(job.summary_fields.internal_limit) }}">
secondary-tag="{{ vm.getSliceJobDetails(job) }}">
</at-row-item>
<div class="at-Row--inline">
<at-row-item

20
awx/ui/client/features/output/details.component.js
View File

@@ -126,22 +126,18 @@ function getSourceWorkflowJobDetails () {
return { link, tooltip };
}
function getSplitJobDetails () {
const internalLimitDetails = resource.model.get('summary_fields.internal_limit');
function getSliceJobDetails () {
const count = resource.model.get('job_slice_count');
if (!internalLimitDetails) {
if (count === 1) {
return null;
}
const splitJobDetails = resource.model.get('summary_fields.internal_limit.split');
const number = resource.model.get('job_slice_number');
if (!splitJobDetails) {
return null;
}
const label = strings.get('labels.SPLIT_JOB');
const offset = `${splitJobDetails.offset + 1}/${splitJobDetails.step}`;
const tooltip = strings.get('tooltips.SPLIT_JOB_DETAILS');
const label = strings.get('labels.SLICE_JOB');
const offset = `${number}/${count}`;
const tooltip = strings.get('tooltips.SLICE_JOB_DETAILS');
return { label, offset, tooltip };
}
@@ -691,7 +687,7 @@ function JobDetailsController (
vm.jobType = getJobTypeDetails();
vm.jobTemplate = getJobTemplateDetails();
vm.sourceWorkflowJob = getSourceWorkflowJobDetails();
vm.splitJobDetails = getSplitJobDetails();
vm.sliceJobDetails = getSliceJobDetails();
vm.inventory = getInventoryDetails();
vm.project = getProjectDetails();
vm.projectUpdate = getProjectUpdateDetails();

8
awx/ui/client/features/output/details.partial.html
View File

@@ -151,10 +151,10 @@
<div class="JobResults-resultRowText">{{ vm.jobType.value }}</div>
</div>
<!-- SPLIT JOB DETAIL -->
<div class="JobResults-resultRow" ng-if="vm.splitJobDetails">
<label class="JobResults-resultRowLabel">{{ vm.splitJobDetails.label }}</label>
<div class="JobResults-resultRowText">{{ vm.splitJobDetails.offset }}</div>
<!-- SLICE JOB DETAIL -->
<div class="JobResults-resultRow" ng-if="vm.sliceJobDetails">
<label class="JobResults-resultRowLabel">{{ vm.sliceJobDetails.label }}</label>
<div class="JobResults-resultRowText">{{ vm.sliceJobDetails.offset }}</div>
</div>
<!-- LAUNCHED BY DETAIL -->

4
awx/ui/client/features/output/output.strings.js
View File

@@ -23,7 +23,7 @@ function OutputStrings (BaseString) {
EXTRA_VARS: t.s('Read-only view of extra variables added to the job template'),
INVENTORY: t.s('View the Inventory'),
JOB_TEMPLATE: t.s('View the Job Template'),
SPLIT_JOB_DETAILS: t.s('Job is one of several from a JT that splits on inventory'),
SLICE_JOB_DETAILS: t.s('Job is one of several from a JT that slices on inventory'),
PROJECT: t.s('View the Project'),
PROJECT_UPDATE: t.s('View Project checkout results'),
SCHEDULE: t.s('View the Schedule'),
@@ -56,7 +56,7 @@ function OutputStrings (BaseString) {
JOB_EXPLANATION: t.s('Explanation'),
JOB_TAGS: t.s('Job Tags'),
JOB_TEMPLATE: t.s('Job Template'),
SPLIT_JOB: t.s('Split Job'),
SLICE_JOB: t.s('Slice Job'),
JOB_TYPE: t.s('Job Type'),
LABELS: t.s('Labels'),
LAUNCHED_BY: t.s('Launched By'),