diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 4196b108cf3..4915691d737 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3368,6 +3368,12 @@ requireValidation: true, buttonLabel: 'label.configure', action: cloudStack.uiCustom.autoscaler(cloudStack.autoscaler) + }, + isHidden: function(args) { + // return 2 == hide header and form, as well as returned item column + // return 2; + + return false; } }, diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js index 5d973aad949..79bb0d4f869 100755 --- a/ui/scripts/ui/widgets/multiEdit.js +++ b/ui/scripts/ui/widgets/multiEdit.js @@ -85,6 +85,12 @@ return true; } + var isHidden = $multi.find('th.' + fieldName).hasClass('always-hide'); + + if (isHidden) { + return true; + } + var $td = $('').addClass(fieldName).appendTo($tr); var $input, val; var $addButton = $multi.find('form .button.add-vm:not(.custom-action)').clone(); @@ -264,7 +270,7 @@ // Align width to main header _medit.refreshItemWidths($multi); - + if (data._hideFields && $.inArray(fieldName, data._hideFields) > -1) { $td.addClass('disabled'); @@ -891,7 +897,16 @@ $td.attr('rel', fieldName); $td.appendTo($inputForm); - if (field.isHidden) { + var isHidden = $.isFunction(field.isHidden) ? + field.isHidden({ context: context }) : field.isHidden; + + if (isHidden) { + // return true == hide only header and form column + // return 2 == hide header and form, as well as returned item column + if (isHidden === 2) { + $th.addClass('always-hide'); + } + $th.hide(); $td.hide(); }