shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

M #-: Removed merge leftovers

Browse Source
This commit is contained in:
Tino Vazquez 2020-02-20 11:20:11 +01:00
parent b6fc504c01
commit 3b4b0be08e
No known key found for this signature in database
GPG Key ID: 2FE9C32E94AEABBE
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sunstone/public/app/utils/wizard-fields.js
View File

@ -34,17 +34,11 @@ define(function(require) {
var fields = $('[wizard_field]', context);
fields.each(function() {
var field = $(this);
<<<<<<< HEAD
if(
field.prop('wizard_field_disabled') != true &&
field.val() != null && field.val().length &&
=======
var field_default = field.attr('default');
var field_value = field.val() || field_default;
if (
field.prop('wizard_field_disabled') != true &&
field_value != null && field_value.length &&
>>>>>>> flow-queue
(field.attr("type") != "checkbox" || field.prop("checked")) &&
(field.attr("type") != "radio" || field.prop("checked"))
) {