From 6cfec58f26b1210548f60ea910a4347e9c44fb1e Mon Sep 17 00:00:00 2001 From: Emmanuel Kasper Date: Wed, 2 Mar 2016 11:26:42 +0100 Subject: [PATCH] fix Timezones window Ext.regModel() was removed from the framework rewrite the store in declarative style with inline data --- www/manager6/data/TimezoneStore.js | 34 +++++++----------------------- www/manager6/node/TimeEdit.js | 2 +- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/www/manager6/data/TimezoneStore.js b/www/manager6/data/TimezoneStore.js index f00cc2ff1..6de132efa 100644 --- a/www/manager6/data/TimezoneStore.js +++ b/www/manager6/data/TimezoneStore.js @@ -1,8 +1,12 @@ +Ext.define('Timezone', { + extend: 'Ext.data.Model', + fields: ['zone'] +}); + Ext.define('PVE.data.TimezoneStore', { extend: 'Ext.data.Store', - - statics: { - timezones: [ + model: 'Timezone', + data: [ ['Africa/Abidjan'], ['Africa/Accra'], ['Africa/Addis_Ababa'], @@ -410,27 +414,5 @@ Ext.define('PVE.data.TimezoneStore', { ['Pacific/Tongatapu'], ['Pacific/Wake'], ['Pacific/Wallis'] - ] - }, - - constructor: function(config) { - var me = this; - - config = config || {}; - - Ext.regModel('Timezone', { - fields: ['zone'], - proxy: { - type: 'memory', - reader: 'array' - } - }); - - Ext.apply(config, { - model: 'Timezone', - data: PVE.data.TimezoneStore.timezones - }); - - me.callParent([config]); - } + ], }); \ No newline at end of file diff --git a/www/manager6/node/TimeEdit.js b/www/manager6/node/TimeEdit.js index 103ee4005..62d3c2114 100644 --- a/www/manager6/node/TimeEdit.js +++ b/www/manager6/node/TimeEdit.js @@ -22,7 +22,7 @@ Ext.define('PVE.node.TimeEdit', { fieldLabel: gettext('Time zone'), name: 'timezone', queryMode: 'local', - store: new PVE.data.TimezoneStore(), + store: Ext.create('PVE.data.TimezoneStore'), valueField: 'zone', displayField: 'zone', triggerAction: 'all',