diff --git a/src/sunstone/public/js/plugins/secgroups-tab.js b/src/sunstone/public/js/plugins/secgroups-tab.js index 8cfcb2ed0f..6aee813f34 100644 --- a/src/sunstone/public/js/plugins/secgroups-tab.js +++ b/src/sunstone/public/js/plugins/secgroups-tab.js @@ -180,10 +180,20 @@ function initialize_create_security_group_dialog(dialog){ } }); - $('#create_security_group_form_advanced',dialog).on('invalid.fndtn.abide', function () { + $('#create_security_group_form_advanced',dialog).on('invalid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + notifyError(tr("One or more required fields are missing or malformed.")); popFormDialog("create_security_group_form", $("#secgroups-tab")); - }).on('valid.fndtn.abide', function() { + }).on('valid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + if ($('#create_security_group_form_advanced',dialog).attr("action") == "create") { var template = $('textarea#template',dialog).val(); diff --git a/src/sunstone/public/js/plugins/support-tab.js b/src/sunstone/public/js/plugins/support-tab.js index eff2f19569..aa9ce97ca3 100644 --- a/src/sunstone/public/js/plugins/support-tab.js +++ b/src/sunstone/public/js/plugins/support-tab.js @@ -434,10 +434,20 @@ function setup_upload_support_file_dialog() { function initialize_create_support_request_dialog() { $('#create_support_request_form_wizard').foundation(); - $('#create_support_request_form_wizard').on('invalid.fndtn.abide', function () { + $('#create_support_request_form_wizard').on('invalid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + notifyError(tr("One or more required fields are missing or malformed.")); popFormDialog("create_support_request_form", $("#support-tab")); - }).on('valid.fndtn.abide', function() { + }).on('valid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + var template = { "subject" : $('#subject', this).val(), "description" : $('#description', this).val(), diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 26ab000f07..9d9e7a0b07 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -3843,10 +3843,20 @@ function initialize_create_template_dialog(dialog) { //$('button',dialog).button(); //Process form - $('#create_template_form_wizard',dialog).on('invalid.fndtn.abide', function () { + $('#create_template_form_wizard',dialog).on('invalid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + notifyError(tr("One or more required fields are missing or malformed.")); popFormDialog("create_template_form", $("#templates-tab")); - }).on('valid.fndtn.abide', function() { + }).on('valid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + if ($('#create_template_form_wizard',dialog).attr("action") == "create") { var vm_json = build_template(this); vm_json = {vmtemplate: vm_json}; @@ -3864,10 +3874,20 @@ function initialize_create_template_dialog(dialog) { } }); - $('#create_template_form_advanced',dialog).on('invalid.fndtn.abide', function () { + $('#create_template_form_advanced',dialog).on('invalid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + notifyError(tr("One or more required fields are missing or malformed.")); popFormDialog("create_template_form", $("#templates-tab")); - }).on('valid.fndtn.abide', function() { + }).on('valid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + if ($('#create_template_form_advanced',dialog).attr("action") == "create") { var template = $('textarea#template',this).val(); diff --git a/src/sunstone/public/js/plugins/vdcs-tab.js b/src/sunstone/public/js/plugins/vdcs-tab.js index b3eb6e44e3..73e35e6fa3 100644 --- a/src/sunstone/public/js/plugins/vdcs-tab.js +++ b/src/sunstone/public/js/plugins/vdcs-tab.js @@ -663,10 +663,20 @@ function initialize_create_vdc_dialog(dialog) { dialog.foundation(); //Process form - $('#create_vdc_form_wizard',dialog).on('invalid.fndtn.abide', function () { + $('#create_vdc_form_wizard',dialog).on('invalid.fndtn.abide', function (e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + notifyError(tr("One or more required fields are missing or malformed.")); popFormDialog("create_vdc_form", $("#vdcs-tab")); - }).on('valid.fndtn.abide', function() { + }).on('valid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + //Fetch values var vdc_json = {}; @@ -830,10 +840,20 @@ function initialize_create_vdc_dialog(dialog) { } }); - $('#create_vdc_form_advanced',dialog).on('invalid.fndtn.abide', function () { + $('#create_vdc_form_advanced',dialog).on('invalid.fndtn.abide', function (e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + notifyError(tr("One or more required fields are missing or malformed.")); popFormDialog("create_vdc_form", $("#vdcs-tab")); - }).on('valid.fndtn.abide', function() { + }).on('valid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + if ($('#create_vdc_form_advanced',dialog).attr("action") == "create") { var template = $('textarea#template',dialog).val(); diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 1032eee2a9..62818e9fd4 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -1398,10 +1398,20 @@ function initialize_create_vnet_dialog(dialog) { dialog.foundation(); //Process form - $('#create_vnet_form_wizard',dialog).on('invalid.fndtn.abide', function () { + $('#create_vnet_form_wizard',dialog).on('invalid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + notifyError(tr("One or more required fields are missing or malformed.")); popFormDialog("create_vnet_form", $("#vnets-tab")); - }).on('valid.fndtn.abide', function() { + }).on('valid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + //Fetch values var network_json = {}; @@ -1440,10 +1450,20 @@ function initialize_create_vnet_dialog(dialog) { } }); - $('#create_vnet_form_advanced',dialog).on('invalid.fndtn.abide', function () { + $('#create_vnet_form_advanced',dialog).on('invalid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + notifyError(tr("One or more required fields are missing or malformed.")); popFormDialog("create_vnet_form", $("#vnets-tab")); - }).on('valid.fndtn.abide', function() { + }).on('valid.fndtn.abide', function(e) { + // Fix for valid event firing twice + if(e.namespace != 'abide.fndtn') { + return; + } + if ($('#create_vnet_form_advanced',dialog).attr("action") == "create") { var template = $('textarea#template',dialog).val();