External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-24 17:17:45 -02:30
Code Issues Packages Projects Releases Wiki Activity

add organization to template views in old and new ui

Browse Source
This commit is contained in:
John Mitchell
2020-02-05 15:51:55 -05:00
committed by AlanCoding
parent 7d0b207571
commit 7547793792
4 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ function TemplatesStrings (BaseString) {
ADD_DD_JT_LABEL: t.s('Job Template'), ADD_DD_JT_LABEL: t.s('Job Template'),
ADD_DD_WF_LABEL: t.s('Workflow Template'), ADD_DD_WF_LABEL: t.s('Workflow Template'),
OPEN_WORKFLOW_VISUALIZER: t.s('Click here to open the workflow visualizer'), OPEN_WORKFLOW_VISUALIZER: t.s('Click here to open the workflow visualizer'),
ROW_ITEM_LABEL_ORGANIZATION: t.s('Organization'),
ROW_ITEM_LABEL_DESCRIPTION: t.s('Description'), ROW_ITEM_LABEL_DESCRIPTION: t.s('Description'),
ROW_ITEM_LABEL_ACTIVITY: t.s('Activity'), ROW_ITEM_LABEL_ACTIVITY: t.s('Activity'),
ROW_ITEM_LABEL_INVENTORY: t.s('Inventory'), ROW_ITEM_LABEL_INVENTORY: t.s('Inventory'),

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

@@ -91,6 +91,11 @@
label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_DESCRIPTION') }}" label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_DESCRIPTION') }}"
value="{{ template.description | sanitize }}"> value="{{ template.description | sanitize }}">
</at-row-item> </at-row-item>
<at-row-item
label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_ORGANIZATION') }}"
value="{{ template.summary_fields.organization.name }}"
value-link="/#/organizations/{{ template.summary_fields.organization.id }}">
</at-row-item>
<at-row-item <at-row-item
label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_INVENTORY') }}" label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_INVENTORY') }}"
value="{{ template.summary_fields.inventory.name }}" value="{{ template.summary_fields.inventory.name }}"

1
awx/ui/client/src/projects/projects.form.js
View File

@@ -47,6 +47,7 @@ export default ['i18n', 'NotificationsList', 'TemplateList',
sourceField: 'name', sourceField: 'name',
dataTitle: i18n._('Organization'), dataTitle: i18n._('Organization'),
required: true, required: true,
awPopOver: '<p>' + i18n._('When this project is used by a Job Template, Organization cannot be changed.') + '</p>',
dataContainer: 'body', dataContainer: 'body',
dataPlacement: 'right', dataPlacement: 'right',
ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd) || !canEditOrg', ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd) || !canEditOrg',

14
awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
View File

@@ -168,6 +168,20 @@ function JobTemplateDetail({ i18n, template }) {
<Detail label={i18n._(t`Name`)} value={name} dataCy="jt-detail-name" /> <Detail label={i18n._(t`Name`)} value={name} dataCy="jt-detail-name" />
<Detail label={i18n._(t`Description`)} value={description} /> <Detail label={i18n._(t`Description`)} value={description} />
<Detail label={i18n._(t`Job Type`)} value={job_type} /> <Detail label={i18n._(t`Job Type`)} value={job_type} />
{summary_fields.organization ? (
<Detail
label={i18n._(t`Organization`)}
value={
<Link
to={`/organizations/${summary_fields.organization.id}/details`}
>
{summary_fields.organization.name}
</Link>
}
/>
) : (
renderMissingDataDetail(i18n._(t`Project`))
)}
{summary_fields.inventory ? ( {summary_fields.inventory ? (
<Detail <Detail
label={i18n._(t`Inventory`)} label={i18n._(t`Inventory`)}