shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases Activity

Merge pull request #6471 from mabashian/6428-related-host-edit

Browse Source 
Fixed nested host add/edit forms
This commit is contained in:
Michael Abashian 2017-06-06 14:36:05 -04:00 committed by GitHub
commit 7923468c0e
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts-add.route.js
View File

@ -9,8 +9,8 @@ export default {
}, },
views: { views: {
'hostForm@inventories': { 'hostForm@inventories': {
templateProvider: function(GenerateForm, RelatedHostsFormDefinition) { templateProvider: function(GenerateForm, RelatedHostsFormDefinition, NestedHostsFormDefinition, $stateParams) {
let form = RelatedHostsFormDefinition; let form = ($stateParams.group_id) ? NestedHostsFormDefinition : RelatedHostsFormDefinition;
return GenerateForm.buildHTML(form, { return GenerateForm.buildHTML(form, {
mode: 'add', mode: 'add',
related: false related: false

5
awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts-edit.route.js
View File

@ -8,10 +8,7 @@ export default {
views: { views: {
'hostForm@inventories': { 'hostForm@inventories': {
templateProvider: function(GenerateForm, RelatedHostsFormDefinition, NestedHostsFormDefinition, $stateParams) { templateProvider: function(GenerateForm, RelatedHostsFormDefinition, NestedHostsFormDefinition, $stateParams) {
let form = RelatedHostsFormDefinition; let form = ($stateParams.group_id) ? NestedHostsFormDefinition : RelatedHostsFormDefinition;
if($stateParams.group_id){
form = NestedHostsFormDefinition;
}
return GenerateForm.buildHTML(form, { return GenerateForm.buildHTML(form, {
mode: 'edit', mode: 'edit',
related: false related: false

2
awx/ui/client/src/inventories/groups/nested-hosts/nested-hosts.form.js
View File

@ -64,7 +64,7 @@ function(i18n) {
ngDisabled: '!(host.summary_fields.user_capabilities.edit || canAdd)', ngDisabled: '!(host.summary_fields.user_capabilities.edit || canAdd)',
type: 'text' type: 'text'
}, },
variables: { host_variables: {
label: i18n._('Variables'), label: i18n._('Variables'),
type: 'textarea', type: 'textarea',
rows: 6, rows: 6,