use RRDTypeSelector from widget toolkit

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 63f3abf7a3b07299d85dcb41d1c3974f0edc8546..ecdba5030f922bd6cf7a13f3e83cbf34c77ab619 100644 (file)
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -22,7 +22,6 @@ JSSRC=                                                        \
        data/ResourceStore.js                           \
        data/model/RRDModels.js                         \
        form/VLanField.js                               \
-       form/RRDTypeSelector.js                         \
        form/KVComboBox.js                              \
        form/Boolean.js                                 \
        form/CompressionSelector.js                     \

diff --git a/www/manager6/form/RRDTypeSelector.js b/www/manager6/form/RRDTypeSelector.js
deleted file mode 100644 (file)
index a912c71..0000000
--- a/www/manager6/form/RRDTypeSelector.js
+++ /dev/null
@@ -1,49 +0,0 @@
-Ext.define('PVE.form.RRDTypeSelector', {
-    extend: 'Ext.form.field.ComboBox',
-    alias: ['widget.pveRRDTypeSelector'],
-
-    displayField: 'text',
-    valueField: 'id',
-    editable: false,
-    queryMode: 'local',
-    value: 'hour',
-    stateEvents: [ 'select' ],
-    stateful: true,
-    stateId: 'pveRRDTypeSelection',
-    store: {
-       type: 'array',
-       fields: [ 'id', 'timeframe', 'cf', 'text' ],
-       data : [
-               [ 'hour', 'hour', 'AVERAGE', "Hour (average)" ],
-               [ 'hourmax', 'hour', 'MAX', "Hour (max)" ],
-               [ 'day', 'day', 'AVERAGE', "Day (average)" ],
-               [ 'daymax', 'day', 'MAX', "Day (max)" ],
-               [ 'week', 'week', 'AVERAGE', "Week (average)" ],
-               [ 'weekmax', 'week', 'MAX', "Week (max)" ],
-               [ 'month', 'month', 'AVERAGE', "Month (average)" ],
-               [ 'monthmax', 'month', 'MAX', "Month (max)" ],
-               [ 'year', 'year', 'AVERAGE', "Year (average)" ],
-               [ 'yearmax', 'year', 'MAX', "Year (max)" ]
-           ]
-       },
-// save current selection in the state Provider so RRDView can read it
-    getState: function() {
-       var ind = this.getStore().findExact('id', this.getValue());
-       var rec = this.getStore().getAt(ind);
-       if (!rec) {
-           return;
-       }
-       return {
-           id: rec.data.id,
-           timeframe: rec.data.timeframe,
-           cf: rec.data.cf
-       };
-    },
-// set selection based on last saved state
-    applyState : function(state) {
-       if (state && state.id) {
-           this.setValue(state.id);
-       }
-    }
-});
-

diff --git a/www/manager6/lxc/Summary.js b/www/manager6/lxc/Summary.js
index 8d05fc0c36e73234a88725112f89634abebd2da5..ad1a4ec44e99e9cd4160c49bbf65323a9bf958f3 100644 (file)
--- a/www/manager6/lxc/Summary.js
+++ b/www/manager6/lxc/Summary.js
@@ -74,7 +74,7 @@ Ext.define('PVE.lxc.Summary', {
            });
 
            Ext.apply(me, {
-               tbar: [ '->' , { xtype: 'pveRRDTypeSelector' } ],
+               tbar: [ '->' , { xtype: 'proxmoxRRDTypeSelector' } ],
                plugins: {
                    ptype: 'lazyitems',
                    items: [

diff --git a/www/manager6/node/Summary.js b/www/manager6/node/Summary.js
index 121e59e0a960d9bcbd4ed7a3d1fa8a3a2e7de284..3392c8ad04e6904e380e59c76676ba68d762d0ed 100644 (file)
--- a/www/manager6/node/Summary.js
+++ b/www/manager6/node/Summary.js
@@ -93,7 +93,7 @@ Ext.define('PVE.node.Summary', {
        });
 
        Ext.apply(me, {
-           tbar: [version_btn, '->', { xtype: 'pveRRDTypeSelector' } ],
+           tbar: [version_btn, '->', { xtype: 'proxmoxRRDTypeSelector' } ],
            plugins: {
                ptype: 'lazyitems',
                items: [

diff --git a/www/manager6/qemu/Summary.js b/www/manager6/qemu/Summary.js
index ff14581552435990e5a3b6b8144b60e99894e1d8..73d273ac401a7cc4c2c8f43146044574fbfc6098 100644 (file)
--- a/www/manager6/qemu/Summary.js
+++ b/www/manager6/qemu/Summary.js
@@ -81,7 +81,7 @@ Ext.define('PVE.qemu.Summary', {
            });
 
            Ext.apply(me, {
-               tbar: [ '->', { xtype: 'pveRRDTypeSelector' } ],
+               tbar: [ '->', { xtype: 'proxmoxRRDTypeSelector' } ],
                plugins: {
                    ptype: 'lazyitems',
                    items: [

diff --git a/www/manager6/storage/Summary.js b/www/manager6/storage/Summary.js
index a94d8170842c31b8d87596bf5ad7a724e2effeed..8b8b59a87ed57f378fba1bb1c9262a8c5a5e2b55 100644 (file)
--- a/www/manager6/storage/Summary.js
+++ b/www/manager6/storage/Summary.js
@@ -10,7 +10,7 @@ Ext.define('PVE.storage.Summary', {
     tbar: [
        '->',
        {
-           xtype: 'pveRRDTypeSelector'
+           xtype: 'proxmoxRRDTypeSelector'
        }
     ],
     initComponent: function() {