coding style cleanups

diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index 2eb6cee2b8735a30f29dded3dc693b40c9a23c37..1a524e1d29424e87a912b17a8c307da0b04763bf 100644 (file)
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -2,6 +2,8 @@ pve-manager (3.1-19) unstable; urgency=low
 
   * vzdump: remove temporary directories (revert bug introduced by 
     commit 1bb6e88fd65bb44a745065d2d899832f6ea0a2f5)
+  
+  * add Editor for new ZFSPlugin
 
  -- Proxmox Support Team <support@proxmox.com>  Fri, 04 Oct 2013 06:55:58 +0200
 

diff --git a/www/manager/storage/ZFSEdit.js b/www/manager/storage/ZFSEdit.js
index 512664461ac8568885958d65d97f3f94af7e466a..2a5a042ed8762883ae32d2a4b2ec7299bfb98864 100644 (file)
--- a/www/manager/storage/ZFSEdit.js
+++ b/www/manager/storage/ZFSEdit.js
@@ -2,85 +2,83 @@ Ext.define('PVE.storage.ZFSInputPanel', {
     extend: 'PVE.panel.InputPanel',
 
     onGetValues: function(values) {
-               var me = this;
-       
-               if (me.create) {
-                       values.type = 'zfs';
-                               values.content = 'images';
-       
-               } else {
-                       delete values.storage;
-               }
-       
-               values.disable = values.enable ? 0 : 1;     
-               delete values.enable;
-       
-               return values;
+       var me = this;
+
+       if (me.create) {
+           values.type = 'zfs';
+           values.content = 'images';
+       } else {
+           delete values.storage;
+       }
+
+       values.disable = values.enable ? 0 : 1;
+       delete values.enable;
+
+       return values;
     },
 
     initComponent : function() {
        var me = this;
 
-
        me.column1 = [
            {
-                       xtype: me.create ? 'textfield' : 'displayfield',
-                       name: 'storage',
-                       height: 22, // hack: set same height as text fields
-                       value: me.storageId || '',
-                       fieldLabel: 'ID',
-                       vtype: 'StorageId',
-                       allowBlank: false
+               xtype: me.create ? 'textfield' : 'displayfield',
+               name: 'storage',
+               height: 22, // hack: set same height as text fields
+               value: me.storageId || '',
+               fieldLabel: 'ID',
+               vtype: 'StorageId',
+               allowBlank: false
            },
            {
-                       xtype: me.create ? 'textfield' : 'displayfield',
-                       name: 'portal',
-                       height: 22, // hack: set same height as text fields
-                       value: '',
-                       fieldLabel: gettext('Portal'),
-                       allowBlank: false
+               xtype: me.create ? 'textfield' : 'displayfield',
+               name: 'portal',
+               height: 22, // hack: set same height as text fields
+               value: '',
+               fieldLabel: gettext('Portal'),
+               allowBlank: false
            },
            {
-                       xtype: me.create ? 'textfield' : 'displayfield',
-                       name: 'pool',
-                       height: 22, // hack: set same height as text fields
-                       value: '',
-                       fieldLabel: gettext('Pool'),
-                       allowBlank: false
+               xtype: me.create ? 'textfield' : 'displayfield',
+               name: 'pool',
+               height: 22, // hack: set same height as text fields
+               value: '',
+               fieldLabel: gettext('Pool'),
+               allowBlank: false
            },
            {
-                       xtype: me.create ? 'textfield' : 'displayfield',
-                       name: 'blocksize',
-                       height: 22, // hack: set same height as text fields
-                       value: '4k',
-                       fieldLabel: gettext('Block Size'),
-                       allowBlank: false
+               xtype: me.create ? 'textfield' : 'displayfield',
+               name: 'blocksize',
+               height: 22, // hack: set same height as text fields
+               value: '4k',
+               fieldLabel: gettext('Block Size'),
+               allowBlank: false
            },
            {
-                       xtype: me.create ? 'textfield' : 'displayfield',
-                       name: 'target',
-                       height: 22, // hack: set same height as text fields
-                       value: 'iqn.2010-09.org.openindiana:omnios:....',
-                       fieldLabel: gettext('Target'),
-                       allowBlank: false
+               xtype: me.create ? 'textfield' : 'displayfield',
+               name: 'target',
+               height: 22, // hack: set same height as text fields
+               value: 'iqn.2010-09.org.openindiana:omnios:....',
+               fieldLabel: gettext('Target'),
+               allowBlank: false
            }
        ];
 
        me.column2 = [
            {
-                       xtype: 'pvecheckbox',
-                       name: 'enable',
-                       checked: true,
-                       uncheckedValue: 0,
-                       fieldLabel: gettext('Enable')
+               xtype: 'pvecheckbox',
+               name: 'enable',
+               checked: true,
+               uncheckedValue: 0,
+               fieldLabel: gettext('Enable')
            },
            {
-                       xtype: me.create ? 'textfield' : 'displayfield',
-                       name: 'iscsiprovider',
-                       height: 22, // hack: set same height as text fields
-                       value: 'Comstar',
-                       fieldLabel: gettext('iSCSI Provider'),
-                       allowBlank: false
+               xtype: me.create ? 'textfield' : 'displayfield',
+               name: 'iscsiprovider',
+               height: 22, // hack: set same height as text fields
+               value: 'Comstar',
+               fieldLabel: gettext('iSCSI Provider'),
+               allowBlank: false
            }
        ];
 
@@ -89,7 +87,7 @@ Ext.define('PVE.storage.ZFSInputPanel', {
                xtype: 'PVE.form.NodeSelector',
                name: 'nodes',
                fieldLabel: gettext('Nodes'),
-               emptyText: gettext('All') + ' (' + 
+               emptyText: gettext('All') + ' (' +
                    gettext('No restrictions') +')',
                multiSelect: true,
                autoSelect: false
@@ -102,10 +100,10 @@ Ext.define('PVE.storage.ZFSInputPanel', {
 
 Ext.define('PVE.storage.ZFSEdit', {
     extend: 'PVE.window.Edit',
-
+    
     initComponent : function() {
        var me = this;
- 
+
        me.create = !me.storageId;
 
        if (me.create) {
@@ -126,7 +124,7 @@ Ext.define('PVE.storage.ZFSEdit', {
            isAdd: true,
            items: [ ipanel ]
        });
-       
+
        me.callParent();
 
         if (!me.create) {