From bc5d0cf8dbe5a10ccb7b73c7d24e5cbf0cb4f16a Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Tue, 1 Mar 2016 13:15:15 +0100 Subject: [PATCH] ext6migrate: change applyIf to apply in the option view, change the applyIf to apply to correctly show the 'Edit' button Signed-off-by: Dominik Csapak --- www/manager6/dc/OptionView.js | 2 +- www/manager6/grid/FirewallOptions.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index bc57a6d4..386ff156 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -178,7 +178,7 @@ Ext.define('PVE.dc.OptionView', { handler: run_editor }); - Ext.applyIf(me, { + Ext.apply(me, { url: "/api2/json/cluster/options", cwidth1: 130, interval: 1000, diff --git a/www/manager6/grid/FirewallOptions.js b/www/manager6/grid/FirewallOptions.js index 596b2223..23b8e6fd 100644 --- a/www/manager6/grid/FirewallOptions.js +++ b/www/manager6/grid/FirewallOptions.js @@ -216,7 +216,7 @@ Ext.define('PVE.FirewallOptions', { edit_btn.setDisabled(!rowdef.editor); }; - Ext.applyIf(me, { + Ext.apply(me, { url: "/api2/json" + me.base_url, cwidth1: 150, tbar: [ edit_btn ],