mirror of
https://github.com/ansible/awx.git
synced 2026-01-11 10:00:01 -03:30
Merge pull request #10828 from AlexSCorey/10628-ConvergenceData_10549-fix
Addresses permission problem on host group list and adds convergence data to Prompt Detail
This commit is contained in:
commit
071973d89e
@ -21,7 +21,7 @@ class Hosts extends Base {
|
||||
}
|
||||
|
||||
readGroupsOptions(id) {
|
||||
return this.http.options(`${this.baseUrl}${id}/all_groups/`);
|
||||
return this.http.options(`${this.baseUrl}${id}/groups/`);
|
||||
}
|
||||
|
||||
associateGroup(id, groupId) {
|
||||
|
||||
@ -87,7 +87,12 @@ function omitOverrides(resource, overrides, defaultConfig) {
|
||||
return clonedResource;
|
||||
}
|
||||
|
||||
function PromptDetail({ resource, launchConfig = {}, overrides = {} }) {
|
||||
function PromptDetail({
|
||||
resource,
|
||||
launchConfig = {},
|
||||
overrides = {},
|
||||
workflowNode = false,
|
||||
}) {
|
||||
const VERBOSITY = {
|
||||
0: t`0 (Normal)`,
|
||||
1: t`1 (Verbose)`,
|
||||
@ -109,6 +114,12 @@ function PromptDetail({ resource, launchConfig = {}, overrides = {} }) {
|
||||
label={t`Type`}
|
||||
value={toTitleCase(details.unified_job_type || details.type)}
|
||||
/>
|
||||
{workflowNode && (
|
||||
<Detail
|
||||
label={t`Convergence`}
|
||||
value={workflowNode?.all_parents_must_converge ? t`All` : t`Any`}
|
||||
/>
|
||||
)}
|
||||
<Detail label={t`Timeout`} value={formatTimeout(details?.timeout)} />
|
||||
{details?.type === 'project' && (
|
||||
<PromptProjectDetail resource={details} />
|
||||
|
||||
@ -192,6 +192,7 @@ function NodeViewModal({ readOnly }) {
|
||||
launchConfig={launchConfig}
|
||||
resource={fullUnifiedJobTemplate}
|
||||
overrides={overrides}
|
||||
workflowNode={nodeToView.originalNodeObject}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user