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

Merge pull request #822 from jakemcdermott/fix-merge-issues

Browse Source 
fix merge issue with inventory source service
This commit is contained in:
Shane McDonald
2017-12-13 13:32:13 -05:00
committed by GitHub
parent a8d4eb7c1d 3b791609cd
commit 00ce244716
1 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js
View File

@@ -121,6 +121,7 @@ export default
if(source === 'ec2'){ if(source === 'ec2'){
return _.map(group_by, 'value').join(','); return _.map(group_by, 'value').join(',');
} }
if(source === 'vmware'){ if(source === 'vmware'){
group_by = _.map(group_by, (i) => {return i.value;}); group_by = _.map(group_by, (i) => {return i.value;});
$("#inventory_source_group_by").siblings(".select2").first().find(".select2-selection__choice").each(function(optionIndex, option){ $("#inventory_source_group_by").siblings(".select2").first().find(".select2-selection__choice").each(function(optionIndex, option){
@@ -149,17 +150,5 @@ export default
.error(this.error.bind(this)) .error(this.error.bind(this))
.finally(); .finally();
} }
if(source === 'vmware'){
group_by = _.map(group_by, (i) => {return i.value;});
$("#inventory_source_group_by").siblings(".select2").first().find(".select2-selection__choice").each(function(optionIndex, option){
group_by.push(option.title);
});
group_by = (Array.isArray(group_by)) ? _.uniq(group_by).join() : "";
return group_by;
}
else {
return;
}
}
}; };
}]; }];