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

More Translations

Browse Source
This commit is contained in:
Jared Tabor
2018-07-30 16:46:32 -07:00
parent c2f60f35b4
commit 1986efebda
20 changed files with 93 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,9 @@ function JobsStrings (BaseString) {
ROW_ITEM_LABEL_INVENTORY: t.s('Inventory'),
ROW_ITEM_LABEL_PROJECT: t.s('Project'),
ROW_ITEM_LABEL_CREDENTIALS: t.s('Credentials'),
NO_RUNNING: t.s('There are no running jobs.')
NO_RUNNING: t.s('There are no running jobs.'),
JOB: t.s('Job'),
STATUS_TOOLTIP: status => t.s('Job {{status}}. Click for details.', { status })
};
}

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

@@ -20,7 +20,7 @@
<!-- TODO: include workflow tab as well -->
<at-row-item
status="{{ job.status }}"
status-tip="Job {{job.status}}. Click for details."
status-tip="{{ vm.strings.get('list.STATUS_TOOLTIP', job.status) }}"
header-value="{{ job.id }} - {{ job.name }}"
header-state="{{ vm.getSref(job) }}"
header-tag="{{ vm.jobTypes[job.type] }}">
@@ -76,6 +76,7 @@
ng-show="job.summary_fields.user_capabilities.start">
</at-relaunch>
<at-row-action icon="fa-minus-circle" ng-click="vm.cancelJob(job)"
tooltip="{{ vm.strings.get('listActions.CANCEL', vm.strings.get('list.JOB')) }}"
ng-show="!vm.isPortalMode && (job.summary_fields.user_capabilities.start &&
(job.status === 'pending' ||
job.status === 'waiting' ||
@@ -85,6 +86,7 @@
job.status === 'running'))">
</at-row-action>
<at-row-action icon="fa-trash" ng-click="vm.deleteJob(job)"
tooltip="{{ vm.strings.get('listActions.DELETE', vm.strings.get('list.JOB')) }}"
ng-show="!vm.isPortalMode && job.summary_fields.user_capabilities.delete &&
!(job.status === 'pending' ||
job.status === 'waiting' ||

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

@@ -73,10 +73,6 @@ function TemplatesStrings (BaseString) {
UNKNOWN_SCHEDULE: t.s('Unable to determine this template\'s type while scheduling.'),
};
ns.actions = {
COPY_WORKFLOW: t.s('Copy Workflow')
};
ns.error = {
HEADER: this.error.HEADER,
CALL: this.error.CALL,

8
awx/ui/client/features/templates/templatesList.controller.js
View File

@@ -180,6 +180,14 @@ function ListTemplatesController(
return html;
};
vm.getType = template => {
if(isJobTemplate(template)) {
return strings.get('list.ADD_DD_JT_LABEL');
} else {
return strings.get('list.ADD_DD_WF_LABEL');;
}
};
function refreshTemplates() {
Wait('start');
let path = GetBasePath('unified_job_templates');

6
awx/ui/client/features/templates/templatesList.view.html
View File

@@ -90,10 +90,12 @@
ng-show="template.summary_fields.user_capabilities.start">
</at-launch-template>
<at-row-action icon="fa-copy" ng-click="vm.copyTemplate(template)"
ng-show="!vm.isPortalMode && template.summary_fields.user_capabilities.copy">
ng-show="!vm.isPortalMode && template.summary_fields.user_capabilities.copy"
tooltip="{{:: vm.strings.get('listActions.COPY', vm.getType(template)) }}">
</at-row-action>
<at-row-action icon="fa-trash" ng-click="vm.deleteTemplate(template)"
ng-show="!vm.isPortalMode && template.summary_fields.user_capabilities.delete">
ng-show="!vm.isPortalMode && template.summary_fields.user_capabilities.delete"
tooltip="{{:: vm.strings.get('listActions.DELETE', vm.getType(template)) }}">
</at-row-action>
</div>
</at-row>