use Checkbox from widget toolkit

[pve-manager.git] / www / manager6 / storage / LVMEdit.js

diff --git a/www/manager6/storage/LVMEdit.js b/www/manager6/storage/LVMEdit.js
index 577f317da7c8d05e8e4791f23025cbf7857a7fbd..531b735a78d1c76e145858912f4bfc7a24d739bf 100644 (file)
--- a/www/manager6/storage/LVMEdit.js
+++ b/www/manager6/storage/LVMEdit.js
@@ -1,7 +1,10 @@
 Ext.define('PVE.storage.VgSelector', {
     extend: 'Ext.form.field.ComboBox',
     alias: 'widget.pveVgSelector',
-
+    valueField: 'vg',
+    displayField: 'vg',
+    queryMode: 'local',
+    editable: false,
     initComponent : function() {
        var me = this;
 
@@ -18,22 +21,12 @@ Ext.define('PVE.storage.VgSelector', {
            }
        });
 
+       store.sort('vg', 'ASC');
+
        Ext.apply(me, {
            store: store,
-           valueField: 'vg',
-           displayField: 'vg',
-           queryMode: 'local',
-           editable: false,
            listConfig: {
-               loadingText: gettext('Scanning...'),
-               listeners: {
-                   // hack: call setHeight to show scroll bars correctly
-                   refresh: function(list) {
-                       var lh = PVE.Utils.gridLineHeigh();
-                       var count = store.getCount();
-                       list.setHeight(lh * ((count > 10) ? 10 : count));
-                   }
-               }
+               loadingText: gettext('Scanning...')
            }
        });
 
@@ -46,7 +39,11 @@ Ext.define('PVE.storage.BaseStorageSelector', {
     alias: 'widget.pveBaseStorageSelector',
 
     existingGroupsText: gettext("Existing volume groups"),
-
+    queryMode: 'local',
+    editable: false,
+    value: '',
+    valueField: 'storage',
+    displayField: 'text',
     initComponent : function() {
        var me = this;
 
@@ -76,13 +73,10 @@ Ext.define('PVE.storage.BaseStorageSelector', {
 
        store.loadData([{ storage: '' }], true);
 
+       store.sort('storage', 'ASC');
+
        Ext.apply(me, {
-           store: store,
-           queryMode: 'local',
-           editable: false,
-           value: '',
-           valueField: 'storage',
-           displayField: 'text'
+           store: store
        });
 
        me.callParent();
@@ -95,15 +89,15 @@ Ext.define('PVE.storage.LVMInputPanel', {
     onGetValues: function(values) {
        var me = this;
 
-       if (me.create) {
+       if (me.isCreate) {
            values.type = 'lvm';
        } else {
            delete values.storage;
        }
 
-       values.disable = values.enable ? 0 : 1;     
+       values.disable = values.enable ? 0 : 1;
        delete values.enable;
-       
+
        return values;
     },
 
@@ -112,28 +106,26 @@ Ext.define('PVE.storage.LVMInputPanel', {
 
        me.column1 = [
            {
-               xtype: me.create ? 'textfield' : 'displayfield',
+               xtype: me.isCreate ? 'textfield' : 'displayfield',
                name: 'storage',
-               height: 22, // hack: set same height as text fields
                value: me.storageId || '',
                fieldLabel: 'ID',
                vtype: 'StorageId',
-               submitValue: !!me.create,
+               submitValue: !!me.isCreate,
                allowBlank: false
            }
        ];
 
-       var vgnameField = Ext.createWidget(me.create ? 'textfield' : 'displayfield', {
-           height: 22, // hack: set same height as text fields
+       var vgnameField = Ext.createWidget(me.isCreate ? 'textfield' : 'displayfield', {
            name: 'vgname',
-           hidden: !!me.create,
-           disabled: !!me.create,
+           hidden: !!me.isCreate,
+           disabled: !!me.isCreate,
            value: '',
            fieldLabel: gettext('Volume group'),
            allowBlank: false
        });
 
-       if (me.create) {
+       if (me.isCreate) {
            var vgField = Ext.create('PVE.storage.VgSelector', {
                name: 'vgname',
                fieldLabel: gettext('Volume group'),
@@ -184,6 +176,9 @@ Ext.define('PVE.storage.LVMInputPanel', {
 
        me.column1.push(vgnameField);
 
+       // here value is an array, 
+       // while before it was a string
+       /*jslint confusion: true*/
        me.column1.push({
            xtype: 'pveContentTypeSelector',
            cts: ['images', 'rootdir'],
@@ -193,26 +188,27 @@ Ext.define('PVE.storage.LVMInputPanel', {
            multiSelect: true,
            allowBlank: false
        });
+       /*jslint confusion: false*/
 
        me.column2 = [
            {
                xtype: 'pveNodeSelector',
                name: 'nodes',
                fieldLabel: gettext('Nodes'),
-               emptyText: gettext('All') + ' (' + 
+               emptyText: gettext('All') + ' (' +
                    gettext('No restrictions') +')',
                multiSelect: true,
                autoSelect: false
            },
            {
-               xtype: 'pvecheckbox',
+               xtype: 'proxmoxcheckbox',
                name: 'enable',
                checked: true,
                uncheckedValue: 0,
                fieldLabel: gettext('Enable')
            },
            {
-               xtype: 'pvecheckbox',
+               xtype: 'proxmoxcheckbox',
                name: 'shared',
                uncheckedValue: 0,
                fieldLabel: gettext('Shared')
@@ -228,10 +224,10 @@ Ext.define('PVE.storage.LVMEdit', {
 
     initComponent : function() {
        var me = this;
- 
-       me.create = !me.storageId;
 
-       if (me.create) {
+       me.isCreate = !me.storageId;
+
+       if (me.isCreate) {
             me.url = '/api2/extjs/storage';
             me.method = 'POST';
         } else {
@@ -240,10 +236,10 @@ Ext.define('PVE.storage.LVMEdit', {
         }
 
        var ipanel = Ext.create('PVE.storage.LVMInputPanel', {
-           create: me.create,
+           isCreate: me.isCreate,
            storageId: me.storageId
        });
-       
+
        Ext.apply(me, {
             subject: PVE.Utils.format_storage_type('lvm'),
            isAdd: true,
@@ -252,7 +248,7 @@ Ext.define('PVE.storage.LVMEdit', {
 
        me.callParent();
 
-       if (!me.create) {
+       if (!me.isCreate) {
            me.load({
                success:  function(response, options) {
                    var values = response.result.data;