From f09dd6c16de929157db66e8cc81ea56fb8a83fb6 Mon Sep 17 00:00:00 2001 From: Emmanuel Kasper Date: Thu, 17 Mar 2016 10:31:11 +0100 Subject: [PATCH] Fixes Hardware View gridPanel for ExtJS6 * uses Ext.apply() instead of applyIf(), because the parent class already set a toolbar to 'null', and we want to override that * use 'activate' event to redisplay content on page reload * use a managed listener via mon() so we ignore events from the store when the component is not displayed ( prevent race conditions) --- www/manager6/qemu/HardwareView.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index 89f2f4e5..aef7e082 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -456,7 +456,7 @@ Ext.define('PVE.qemu.HardwareView', { }; - Ext.applyIf(me, { + Ext.apply(me, { url: '/api2/json/' + 'nodes/' + nodename + '/qemu/' + vmid + '/pending', interval: 5000, selModel: sm, @@ -526,11 +526,11 @@ Ext.define('PVE.qemu.HardwareView', { me.callParent(); - me.on('show', me.rstore.startUpdate); + me.on('activate', me.rstore.startUpdate); me.on('hide', me.rstore.stopUpdate); me.on('destroy', me.rstore.stopUpdate); - me.rstore.on('datachanged', function() { + me.mon(me.rstore, 'refresh', function() { set_button_status(); }); }