[pve-devel] r6363 - in pve-manager/pve2: . www/manager www/manager/storage

svn-commits at proxmox.com svn-commits at proxmox.com
Tue Jul 26 10:27:06 CEST 2011


Author: dietmar
Date: 2011-07-26 10:27:06 +0200 (Tue, 26 Jul 2011)
New Revision: 6363

Added:
   pve-manager/pve2/www/manager/storage/IScsiEdit.js
Removed:
   pve-manager/pve2/www/manager/storage/iSCSIEdit.js
Modified:
   pve-manager/pve2/ChangeLog
   pve-manager/pve2/www/manager/Makefile.am
Log:
rename file


Modified: pve-manager/pve2/ChangeLog
===================================================================
--- pve-manager/pve2/ChangeLog	2011-07-26 08:25:32 UTC (rev 6362)
+++ pve-manager/pve2/ChangeLog	2011-07-26 08:27:06 UTC (rev 6363)
@@ -1,6 +1,6 @@
 2011-07-26  Proxmox Support Team  <support at proxmox.com>
 
-	* www/manager/storage/iSCSIEdit.js: impl.
+	* www/manager/storage/IScsiEdit.js: impl.
 
 2011-07-25  Proxmox Support Team  <support at proxmox.com>
 

Modified: pve-manager/pve2/www/manager/Makefile.am
===================================================================
--- pve-manager/pve2/www/manager/Makefile.am	2011-07-26 08:25:32 UTC (rev 6362)
+++ pve-manager/pve2/www/manager/Makefile.am	2011-07-26 08:27:06 UTC (rev 6363)
@@ -85,7 +85,7 @@
 	storage/Browser.js				\
 	storage/DirEdit.js				\
 	storage/NFSEdit.js				\
-	storage/iSCSIEdit.js				\
+	storage/IScsiEdit.js				\
 	dc/StorageView.js				\
 	dc/UserEdit.js					\
 	dc/UserView.js					\

Copied: pve-manager/pve2/www/manager/storage/IScsiEdit.js (from rev 6362, pve-manager/pve2/www/manager/storage/iSCSIEdit.js)
===================================================================
--- pve-manager/pve2/www/manager/storage/IScsiEdit.js	                        (rev 0)
+++ pve-manager/pve2/www/manager/storage/IScsiEdit.js	2011-07-26 08:27:06 UTC (rev 6363)
@@ -0,0 +1,186 @@
+Ext.define('PVE.storage.IScsiScan', {
+    extend: 'Ext.form.field.ComboBox',
+    alias: 'widget.pveIScsiScan',
+
+    queryParam: 'portal',
+
+    doRawQuery: function() {
+    },
+
+    onTriggerClick: function() {
+	var me = this;
+
+	if (!me.queryCaching || me.lastQuery !== me.portal) {
+	    me.store.removeAll();
+	}
+
+	me.allQuery = me.portal;
+
+	me.callParent();
+    },
+
+    setPortal: function(portal) {
+	var me = this;
+
+	me.portal = portal;
+    },
+
+    initComponent : function() {
+	var me = this;
+
+	if (!me.nodename) {
+	    me.nodename = 'localhost';
+	}
+
+	var store = Ext.create('Ext.data.Store', {
+	    fields: [ 'target', 'portal' ],
+	    proxy: {
+		type: 'pve',
+		url: '/api2/json/nodes/' + me.nodename + '/scan/iscsi'
+	    }
+	});
+
+	Ext.apply(me, {
+	    store: store,
+	    valueField: 'target',
+	    displayField: 'target',
+	    matchFieldWidth: false,
+	    listConfig: {
+		loadingText: 'Scanning...',
+		width: 350
+	    }
+	});
+
+	me.callParent();
+    }
+});
+
+Ext.define('PVE.storage.IScsiInputPanel', {
+    extend: 'PVE.panel.InputPanel',
+
+    onGetValues: function(values) {
+	var me = this;
+
+	if (me.create) {
+	    values.type = 'iscsi';
+	} else {
+	    delete values.storage;
+	}
+
+	values.content = values.luns ? 'images' : 'none';
+	delete values.luns;
+
+	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: 'Storage ID',
+		vtype: 'StorageId',
+		allowBlank: false
+	    },
+	    {
+		xtype: me.create ? 'textfield' : 'displayfield',
+		height: 22, // hack: set same height as text fields
+		name: 'portal',
+		value: '',
+		fieldLabel: 'Portal',
+		allowBlank: false,
+		listeners: {
+		    change: function(f, value) {
+			if (me.create) {
+			    var exportField = me.down('field[name=target]');
+			    exportField.setPortal(value);
+			    exportField.setValue('');
+			}
+		    }
+		}
+	    },
+	    {
+		readOnly: !me.create,
+		xtype: me.create ? 'pveIScsiScan' : 'displayfield',
+		name: 'target',
+		value: '',
+		fieldLabel: 'Target',
+		allowBlank: false
+	    }
+	];
+
+	me.column2 = [
+	    {
+		xtype: 'pvecheckbox',
+		name: 'enable',
+		checked: true,
+		uncheckedValue: 0,
+		fieldLabel: 'Enable'
+	    },
+	    {
+		xtype: 'checkbox',
+		name: 'luns',
+		checked: true,
+		fieldLabel: 'Use LUNs directly'
+	    }
+	];
+
+	me.callParent();
+    }
+});
+
+Ext.define('PVE.storage.IScsiEdit', {
+    extend: 'PVE.window.Edit',
+
+    initComponent : function() {
+	var me = this;
+ 
+	me.create = !me.storageId;
+
+	if (me.create) {
+            me.url = '/api2/extjs/storage';
+            me.method = 'POST';
+        } else {
+            me.url = '/api2/extjs/storage/' + me.storageId;
+            me.method = 'PUT';
+        }
+
+	var ipanel = Ext.create('PVE.storage.IScsiInputPanel', {
+	    create: me.create,
+	    storageId: me.storageId
+	});
+	
+	Ext.apply(me, {
+	    title: me.create ? "Create iSCSI storage" :
+		"Edit iSCSI storage '" + me.storageId + "'",
+	    items: [ ipanel ]
+	});
+
+	me.callParent();
+
+	if (!me.create) {
+	    me.load({
+		success:  function(response, options) {
+		    var values = response.result.data;
+		    var ctypes = values.content || '';
+
+		    if (values.storage === 'local') {
+			values.content = ctypes.split(',');
+		    }
+		    values.enable = values.disable ? 0 : 1;
+		    values.luns = (values.content === 'images') ? true : false;
+
+		    ipanel.setValues(values);
+		}
+	    });
+	}
+    }
+});

Deleted: pve-manager/pve2/www/manager/storage/iSCSIEdit.js
===================================================================
--- pve-manager/pve2/www/manager/storage/iSCSIEdit.js	2011-07-26 08:25:32 UTC (rev 6362)
+++ pve-manager/pve2/www/manager/storage/iSCSIEdit.js	2011-07-26 08:27:06 UTC (rev 6363)
@@ -1,186 +0,0 @@
-Ext.define('PVE.storage.IScsiScan', {
-    extend: 'Ext.form.field.ComboBox',
-    alias: 'widget.pveIScsiScan',
-
-    queryParam: 'portal',
-
-    doRawQuery: function() {
-    },
-
-    onTriggerClick: function() {
-	var me = this;
-
-	if (!me.queryCaching || me.lastQuery !== me.portal) {
-	    me.store.removeAll();
-	}
-
-	me.allQuery = me.portal;
-
-	me.callParent();
-    },
-
-    setPortal: function(portal) {
-	var me = this;
-
-	me.portal = portal;
-    },
-
-    initComponent : function() {
-	var me = this;
-
-	if (!me.nodename) {
-	    me.nodename = 'localhost';
-	}
-
-	var store = Ext.create('Ext.data.Store', {
-	    fields: [ 'target', 'portal' ],
-	    proxy: {
-		type: 'pve',
-		url: '/api2/json/nodes/' + me.nodename + '/scan/iscsi'
-	    }
-	});
-
-	Ext.apply(me, {
-	    store: store,
-	    valueField: 'target',
-	    displayField: 'target',
-	    matchFieldWidth: false,
-	    listConfig: {
-		loadingText: 'Scanning...',
-		width: 350
-	    }
-	});
-
-	me.callParent();
-    }
-});
-
-Ext.define('PVE.storage.IScsiInputPanel', {
-    extend: 'PVE.panel.InputPanel',
-
-    onGetValues: function(values) {
-	var me = this;
-
-	if (me.create) {
-	    values.type = 'iscsi';
-	} else {
-	    delete values.storage;
-	}
-
-	values.content = values.luns ? 'images' : 'none';
-	delete values.luns;
-
-	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: 'Storage ID',
-		vtype: 'StorageId',
-		allowBlank: false
-	    },
-	    {
-		xtype: me.create ? 'textfield' : 'displayfield',
-		height: 22, // hack: set same height as text fields
-		name: 'portal',
-		value: '',
-		fieldLabel: 'Portal',
-		allowBlank: false,
-		listeners: {
-		    change: function(f, value) {
-			if (me.create) {
-			    var exportField = me.down('field[name=target]');
-			    exportField.setPortal(value);
-			    exportField.setValue('');
-			}
-		    }
-		}
-	    },
-	    {
-		readOnly: !me.create,
-		xtype: me.create ? 'pveIScsiScan' : 'displayfield',
-		name: 'target',
-		value: '',
-		fieldLabel: 'Target',
-		allowBlank: false
-	    }
-	];
-
-	me.column2 = [
-	    {
-		xtype: 'pvecheckbox',
-		name: 'enable',
-		checked: true,
-		uncheckedValue: 0,
-		fieldLabel: 'Enable'
-	    },
-	    {
-		xtype: 'checkbox',
-		name: 'luns',
-		checked: true,
-		fieldLabel: 'Use LUNs directly'
-	    }
-	];
-
-	me.callParent();
-    }
-});
-
-Ext.define('PVE.storage.IScsiEdit', {
-    extend: 'PVE.window.Edit',
-
-    initComponent : function() {
-	var me = this;
- 
-	me.create = !me.storageId;
-
-	if (me.create) {
-            me.url = '/api2/extjs/storage';
-            me.method = 'POST';
-        } else {
-            me.url = '/api2/extjs/storage/' + me.storageId;
-            me.method = 'PUT';
-        }
-
-	var ipanel = Ext.create('PVE.storage.IScsiInputPanel', {
-	    create: me.create,
-	    storageId: me.storageId
-	});
-	
-	Ext.apply(me, {
-	    title: me.create ? "Create iSCSI storage" :
-		"Edit iSCSI storage '" + me.storageId + "'",
-	    items: [ ipanel ]
-	});
-
-	me.callParent();
-
-	if (!me.create) {
-	    me.load({
-		success:  function(response, options) {
-		    var values = response.result.data;
-		    var ctypes = values.content || '';
-
-		    if (values.storage === 'local') {
-			values.content = ctypes.split(',');
-		    }
-		    values.enable = values.disable ? 0 : 1;
-		    values.luns = (values.content === 'images') ? true : false;
-
-		    ipanel.setValues(values);
-		}
-	    });
-	}
-    }
-});



More information about the pve-devel mailing list