External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-25 06:56:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

fixed grunt errors

Browse Source
This commit is contained in:
John Mitchell
2015-04-27 10:20:37 -04:00
parent 40b26e42bb
commit 2522160f96
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
awx/ui/static/js/helpers/Groups.js
View File

@@ -304,18 +304,18 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name
ParseTypeChange({ scope: scope, variable: 'extra_vars', parse_variable: form.fields.extra_vars.parseTypeName, ParseTypeChange({ scope: scope, variable: 'extra_vars', parse_variable: form.fields.extra_vars.parseTypeName,
field_id: 'source_extra_vars', onReady: callback }); field_id: 'source_extra_vars', onReady: callback });
} }
if(scope.source.value==="vmware" if(scope.source.value==="vmware" ||
|| scope.source.value==="openstack"){ scope.source.value==="openstack"){
scope.inventory_variables = (Empty(scope.source_vars)) ? "---" : scope.source_vars; scope.inventory_variables = (Empty(scope.source_vars)) ? "---" : scope.source_vars;
ParseTypeChange({ scope: scope, variable: 'inventory_variables', parse_variable: form.fields.inventory_variables.parseTypeName, ParseTypeChange({ scope: scope, variable: 'inventory_variables', parse_variable: form.fields.inventory_variables.parseTypeName,
field_id: 'source_inventory_variables', onReady: callback }); field_id: 'source_inventory_variables', onReady: callback });
} }
if (scope.source.value === 'rax' if (scope.source.value === 'rax' ||
|| scope.source.value === 'ec2' scope.source.value === 'ec2' ||
|| scope.source.value==='gce' scope.source.value==='gce' ||
|| scope.source.value === 'azure' scope.source.value === 'azure' ||
|| scope.source.value === 'vmware' scope.source.value === 'vmware' ||
|| scope.source.value === 'openstack') { scope.source.value === 'openstack') {
if (scope.source.value === 'ec2') { if (scope.source.value === 'ec2') {
kind = 'aws'; kind = 'aws';
} else { } else {
@@ -330,8 +330,8 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name
field: 'credential', field: 'credential',
input_type: "radio" input_type: "radio"
}); });
if ($('#group_tabs .active a').text() === 'Source' if ($('#group_tabs .active a').text() === 'Source' &&
&& (scope.source.value === 'ec2' )) { (scope.source.value === 'ec2' )) {
callback = function(){ Wait('stop'); }; callback = function(){ Wait('stop'); };
Wait('start'); Wait('start');
scope.source_vars = (Empty(scope.source_vars)) ? "---" : scope.source_vars; scope.source_vars = (Empty(scope.source_vars)) ? "---" : scope.source_vars;
@@ -918,8 +918,8 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name
Wait('start'); Wait('start');
ParseTypeChange({ scope: sources_scope, variable: 'source_vars', parse_variable: SourceForm.fields.source_vars.parseTypeName, ParseTypeChange({ scope: sources_scope, variable: 'source_vars', parse_variable: SourceForm.fields.source_vars.parseTypeName,
field_id: 'source_source_vars', onReady: waitStop }); field_id: 'source_source_vars', onReady: waitStop });
} else if (sources_scope.source && (sources_scope.source.value === 'vmware' } else if (sources_scope.source && (sources_scope.source.value === 'vmware' ||
|| sources_scope.source.value === 'openstack')) { sources_scope.source.value === 'openstack')) {
Wait('start'); Wait('start');
ParseTypeChange({ scope: sources_scope, variable: 'inventory_variables', parse_variable: SourceForm.fields.inventory_variables.parseTypeName, ParseTypeChange({ scope: sources_scope, variable: 'inventory_variables', parse_variable: SourceForm.fields.inventory_variables.parseTypeName,
field_id: 'source_inventory_variables', onReady: waitStop }); field_id: 'source_inventory_variables', onReady: waitStop });
@@ -1298,8 +1298,8 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name
data.source_vars = ToJSON(sources_scope.envParseType, sources_scope.extra_vars, true); data.source_vars = ToJSON(sources_scope.envParseType, sources_scope.extra_vars, true);
} }
if (sources_scope.source && (sources_scope.source.value === 'vmware' if (sources_scope.source && (sources_scope.source.value === 'vmware' ||
|| sources_scope.source.value === 'openstack')) { sources_scope.source.value === 'openstack')) {
data.source_vars = ToJSON(sources_scope.envParseType, sources_scope.inventory_variables, true); data.source_vars = ToJSON(sources_scope.envParseType, sources_scope.inventory_variables, true);
} }