Rename 'create' to 'isCreate' in pveWindowEdit and subclasses

This fixes around 20 jslint type confusion warnings.
Also reduce the scope and document jslint warnings along the way.
No functional changes.
This commit is contained in:
Emmanuel Kasper 2017-02-28 14:26:49 +01:00 committed by Dietmar Maurer
parent 67cb91e4d7
commit d5e771ce51
38 changed files with 268 additions and 280 deletions

View File

@ -14,7 +14,7 @@ Ext.define('PVE.CephCreateMon', {
}, },
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;
if (!me.nodename) { if (!me.nodename) {
@ -23,7 +23,7 @@ Ext.define('PVE.CephCreateMon', {
me.setNode(me.nodename); me.setNode(me.nodename);
me.create = true; me.isCreate = true;
Ext.applyIf(me, { Ext.applyIf(me, {
method: 'POST', method: 'POST',

View File

@ -82,14 +82,13 @@ Ext.define('PVE.CephCreateOsd', {
showProgress: true, showProgress: true,
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;
if (!me.nodename) { if (!me.nodename) {
throw "no node name specified"; throw "no node name specified";
} }
me.create = true; me.isCreate = true;
Ext.applyIf(me, { Ext.applyIf(me, {
url: "/nodes/" + me.nodename + "/ceph/osd", url: "/nodes/" + me.nodename + "/ceph/osd",
@ -139,7 +138,7 @@ Ext.define('PVE.CephRemoveOsd', {
} }
], ],
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;
if (!me.nodename) { if (!me.nodename) {
@ -149,12 +148,12 @@ Ext.define('PVE.CephRemoveOsd', {
throw "no osdid specified"; throw "no osdid specified";
} }
me.create = true; me.isCreate = true;
me.title = gettext('Remove') + ': ' + 'Ceph OSD osd.' + me.osdid; me.title = gettext('Remove') + ': ' + 'Ceph OSD osd.' + me.osdid.toString();
Ext.applyIf(me, { Ext.applyIf(me, {
url: "/nodes/" + me.nodename + "/ceph/osd/" + me.osdid url: "/nodes/" + me.nodename + "/ceph/osd/" + me.osdid.toString()
}); });
me.callParent(); me.callParent();

View File

@ -1,12 +1,9 @@
// Ext.create is a function, but
// we defined create a bool in PVE.window.Edit
/*jslint confusion: true*/
Ext.define('PVE.CephCreatePool', { Ext.define('PVE.CephCreatePool', {
extend: 'PVE.window.Edit', extend: 'PVE.window.Edit',
alias: ['widget.pveCephCreatePool'], alias: ['widget.pveCephCreatePool'],
subject: 'Ceph Pool', subject: 'Ceph Pool',
create: true, isCreate: true,
method: 'POST', method: 'POST',
items: [ items: [
{ {

View File

@ -5,10 +5,10 @@ Ext.define('PVE.dc.ACLAdd', {
method: 'PUT', method: 'PUT',
isAdd: true, isAdd: true,
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;
me.create = true; me.isCreate = true;
var items = [ var items = [
{ {

View File

@ -7,13 +7,13 @@ Ext.define('PVE.dc.AuthEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.realm; me.isCreate = !me.realm;
var url; var url;
var method; var method;
var serverlist; var serverlist;
if (me.create) { if (me.isCreate) {
url = '/api2/extjs/access/domains'; url = '/api2/extjs/access/domains';
method = 'POST'; method = 'POST';
} else { } else {
@ -23,7 +23,7 @@ Ext.define('PVE.dc.AuthEdit', {
var column1 = [ var column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'realm', name: 'realm',
fieldLabel: gettext('Realm'), fieldLabel: gettext('Realm'),
value: me.realm, value: me.realm,
@ -64,7 +64,7 @@ Ext.define('PVE.dc.AuthEdit', {
}); });
} else if (me.authType === 'pve') { } else if (me.authType === 'pve') {
if (me.create) { if (me.isCreate) {
throw 'unknown auth type'; throw 'unknown auth type';
} }
@ -72,7 +72,7 @@ Ext.define('PVE.dc.AuthEdit', {
} else if (me.authType === 'pam') { } else if (me.authType === 'pam') {
if (me.create) { if (me.isCreate) {
throw 'unknown auth type'; throw 'unknown auth type';
} }
@ -102,7 +102,7 @@ Ext.define('PVE.dc.AuthEdit', {
{ {
xtype: 'pvetextfield', xtype: 'pvetextfield',
fieldLabel: gettext('Fallback Server'), fieldLabel: gettext('Fallback Server'),
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
name: 'server2' name: 'server2'
}, },
{ {
@ -128,7 +128,7 @@ Ext.define('PVE.dc.AuthEdit', {
column2.push({ column2.push({
xtype: 'pveKVComboBox', xtype: 'pveKVComboBox',
name: 'tfa', name: 'tfa',
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
value: '', value: '',
fieldLabel: gettext('TFA'), fieldLabel: gettext('TFA'),
comboItems: [ ['__default__', PVE.Utils.noneText], ['oath', 'OATH'], ['yubico', 'Yubico']], comboItems: [ ['__default__', PVE.Utils.noneText], ['oath', 'OATH'], ['yubico', 'Yubico']],
@ -200,13 +200,13 @@ Ext.define('PVE.dc.AuthEdit', {
}], }],
onGetValues: function(values) { onGetValues: function(values) {
if (!values.port) { if (!values.port) {
if (!me.create) { if (!me.isCreate) {
PVE.Utils.assemble_field_data(values, { 'delete': 'port' }); PVE.Utils.assemble_field_data(values, { 'delete': 'port' });
} }
delete values.port; delete values.port;
} }
if (me.create) { if (me.isCreate) {
values.type = me.authType; values.type = me.authType;
} }
@ -250,7 +250,7 @@ Ext.define('PVE.dc.AuthEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var data = response.result.data || {}; var data = response.result.data || {};

View File

@ -3,15 +3,14 @@ Ext.define('PVE.dc.BackupEdit', {
alias: ['widget.pveDcBackupEdit'], alias: ['widget.pveDcBackupEdit'],
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;
me.create = !me.jobid; me.isCreate = !me.jobid;
var url; var url;
var method; var method;
if (me.create) { if (me.isCreate) {
url = '/api2/extjs/cluster/backup'; url = '/api2/extjs/cluster/backup';
method = 'POST'; method = 'POST';
} else { } else {
@ -23,6 +22,8 @@ Ext.define('PVE.dc.BackupEdit', {
name: 'vmid' name: 'vmid'
}); });
/*jslint confusion: true*/
// 'value' can be assigned a string or an array
var selModeField = Ext.create('PVE.form.KVComboBox', { var selModeField = Ext.create('PVE.form.KVComboBox', {
xtype: 'pveKVComboBox', xtype: 'pveKVComboBox',
comboItems: [ comboItems: [
@ -162,14 +163,14 @@ Ext.define('PVE.dc.BackupEdit', {
xtype: 'pveEmailNotificationSelector', xtype: 'pveEmailNotificationSelector',
fieldLabel: gettext('Email notification'), fieldLabel: gettext('Email notification'),
name: 'mailnotification', name: 'mailnotification',
deleteEmpty: me.create ? false : true, deleteEmpty: me.isCreate ? false : true,
value: me.create ? 'always' : '' value: me.isCreate ? 'always' : ''
}, },
{ {
xtype: 'pveCompressionSelector', xtype: 'pveCompressionSelector',
fieldLabel: gettext('Compression'), fieldLabel: gettext('Compression'),
name: 'compress', name: 'compress',
deleteEmpty: me.create ? false : true, deleteEmpty: me.isCreate ? false : true,
value: 'lzo' value: 'lzo'
}, },
{ {
@ -188,13 +189,14 @@ Ext.define('PVE.dc.BackupEdit', {
}, },
vmidField vmidField
]; ];
/*jslint confusion: false*/
var ipanel = Ext.create('PVE.panel.InputPanel', { var ipanel = Ext.create('PVE.panel.InputPanel', {
column1: column1, column1: column1,
column2: column2, column2: column2,
onGetValues: function(values) { onGetValues: function(values) {
if (!values.node) { if (!values.node) {
if (!me.create) { if (!me.isCreate) {
PVE.Utils.assemble_field_data(values, { 'delete': 'node' }); PVE.Utils.assemble_field_data(values, { 'delete': 'node' });
} }
delete values.node; delete values.node;
@ -279,7 +281,7 @@ Ext.define('PVE.dc.BackupEdit', {
me.callParent(); me.callParent();
if (me.create) { if (me.isCreate) {
selModeField.setValue('include'); selModeField.setValue('include');
} else { } else {
me.load({ me.load({

View File

@ -5,12 +5,12 @@ Ext.define('PVE.dc.GroupEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.groupid; me.isCreate = !me.groupid;
var url; var url;
var method; var method;
if (me.create) { if (me.isCreate) {
url = '/api2/extjs/access/groups'; url = '/api2/extjs/access/groups';
method = 'POST'; method = 'POST';
} else { } else {
@ -24,7 +24,7 @@ Ext.define('PVE.dc.GroupEdit', {
method: method, method: method,
items: [ items: [
{ {
xtype: me.create ? 'pvetextfield' : 'displayfield', xtype: me.isCreate ? 'pvetextfield' : 'displayfield',
fieldLabel: gettext('Name'), fieldLabel: gettext('Name'),
name: 'groupid', name: 'groupid',
value: me.groupid, value: me.groupid,
@ -41,7 +41,7 @@ Ext.define('PVE.dc.GroupEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load(); me.load();
} }
} }

View File

@ -5,12 +5,12 @@ Ext.define('PVE.dc.PoolEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.poolid; me.isCreate = !me.poolid;
var url; var url;
var method; var method;
if (me.create) { if (me.isCreate) {
url = '/api2/extjs/pools'; url = '/api2/extjs/pools';
method = 'POST'; method = 'POST';
} else { } else {
@ -24,7 +24,7 @@ Ext.define('PVE.dc.PoolEdit', {
method: method, method: method,
items: [ items: [
{ {
xtype: me.create ? 'pvetextfield' : 'displayfield', xtype: me.isCreate ? 'pvetextfield' : 'displayfield',
fieldLabel: gettext('Name'), fieldLabel: gettext('Name'),
name: 'poolid', name: 'poolid',
value: me.poolid, value: me.poolid,
@ -41,7 +41,7 @@ Ext.define('PVE.dc.PoolEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load(); me.load();
} }
} }

View File

@ -6,10 +6,9 @@ Ext.define('PVE.SecurityGroupEdit', {
allow_iface: false, allow_iface: false,
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;
me.create = (me.group_name === undefined); me.isCreate = (me.group_name === undefined);
var subject; var subject;
@ -32,7 +31,7 @@ Ext.define('PVE.SecurityGroupEdit', {
} }
]; ];
if (me.create) { if (me.isCreate) {
subject = gettext('Security Group'); subject = gettext('Security Group');
} else { } else {
subject = gettext('Security Group') + " '" + me.group_name + "'"; subject = gettext('Security Group') + " '" + me.group_name + "'";
@ -44,7 +43,8 @@ Ext.define('PVE.SecurityGroupEdit', {
} }
var ipanel = Ext.create('PVE.panel.InputPanel', { var ipanel = Ext.create('PVE.panel.InputPanel', {
create: me.create, // InputPanel does not have a 'create' property, does it need a 'isCreate'
isCreate: me.isCreate,
items: items items: items
}); });

View File

@ -7,13 +7,13 @@ Ext.define('PVE.dc.UserEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.userid; me.isCreate = !me.userid;
var url; var url;
var method; var method;
var realm; var realm;
if (me.create) { if (me.isCreate) {
url = '/api2/extjs/access/users'; url = '/api2/extjs/access/users';
method = 'POST'; method = 'POST';
} else { } else {
@ -68,12 +68,12 @@ Ext.define('PVE.dc.UserEdit', {
var column1 = [ var column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'userid', name: 'userid',
fieldLabel: gettext('User name'), fieldLabel: gettext('User name'),
value: me.userid, value: me.userid,
allowBlank: false, allowBlank: false,
submitValue: me.create ? true : false submitValue: me.isCreate ? true : false
}, },
pwfield, verifypw, pwfield, verifypw,
{ {
@ -133,7 +133,7 @@ Ext.define('PVE.dc.UserEdit', {
} }
]; ];
if (me.create) { if (me.isCreate) {
column1.splice(1,0,{ column1.splice(1,0,{
xtype: 'pveRealmComboBox', xtype: 'pveRealmComboBox',
name: 'realm', name: 'realm',
@ -185,7 +185,7 @@ Ext.define('PVE.dc.UserEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var data = response.result.data; var data = response.result.data;

View File

@ -6,12 +6,12 @@ Ext.define('PVE.FirewallAliasEdit', {
alias_name: undefined, alias_name: undefined,
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;
me.create = (me.alias_name === undefined); me.isCreate = (me.alias_name === undefined);
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs' + me.base_url; me.url = '/api2/extjs' + me.base_url;
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -22,7 +22,7 @@ Ext.define('PVE.FirewallAliasEdit', {
var items = [ var items = [
{ {
xtype: 'textfield', xtype: 'textfield',
name: me.create ? 'name' : 'rename', name: me.isCreate ? 'name' : 'rename',
fieldLabel: gettext('Name'), fieldLabel: gettext('Name'),
allowBlank: false allowBlank: false
}, },
@ -40,7 +40,7 @@ Ext.define('PVE.FirewallAliasEdit', {
]; ];
var ipanel = Ext.create('PVE.panel.InputPanel', { var ipanel = Ext.create('PVE.panel.InputPanel', {
create: me.create, isCreate: me.isCreate,
items: items items: items
}); });
@ -52,7 +52,7 @@ Ext.define('PVE.FirewallAliasEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;
@ -78,7 +78,6 @@ Ext.define('PVE.FirewallAliases', {
title: gettext('Alias'), title: gettext('Alias'),
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;

View File

@ -108,7 +108,7 @@ Ext.define('PVE.FirewallRulePanel', {
me.column1.push({ me.column1.push({
xtype: 'pvetextfield', xtype: 'pvetextfield',
name: 'iface', name: 'iface',
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
value: '', value: '',
fieldLabel: gettext('Interface') fieldLabel: gettext('Interface')
}); });
@ -230,7 +230,7 @@ Ext.define('PVE.FirewallRuleEdit', {
allow_iface: false, allow_iface: false,
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;
if (!me.base_url) { if (!me.base_url) {
@ -240,9 +240,9 @@ Ext.define('PVE.FirewallRuleEdit', {
throw "no list_refs_url specified"; throw "no list_refs_url specified";
} }
me.create = (me.rule_pos === undefined); me.isCreate = (me.rule_pos === undefined);
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs' + me.base_url; me.url = '/api2/extjs' + me.base_url;
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -251,7 +251,7 @@ Ext.define('PVE.FirewallRuleEdit', {
} }
var ipanel = Ext.create('PVE.FirewallRulePanel', { var ipanel = Ext.create('PVE.FirewallRulePanel', {
create: me.create, isCreate: me.isCreate,
list_refs_url: me.list_refs_url, list_refs_url: me.list_refs_url,
allow_iface: me.allow_iface, allow_iface: me.allow_iface,
rule_pos: me.rule_pos rule_pos: me.rule_pos
@ -265,7 +265,7 @@ Ext.define('PVE.FirewallRuleEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;
@ -294,12 +294,12 @@ Ext.define('PVE.FirewallGroupRuleEdit', {
allow_iface: false, allow_iface: false,
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;
me.create = (me.rule_pos === undefined); me.isCreate = (me.rule_pos === undefined);
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs' + me.base_url; me.url = '/api2/extjs' + me.base_url;
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -326,14 +326,14 @@ Ext.define('PVE.FirewallGroupRuleEdit', {
column1.push({ column1.push({
xtype: 'pvetextfield', xtype: 'pvetextfield',
name: 'iface', name: 'iface',
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
value: '', value: '',
fieldLabel: gettext('Interface') fieldLabel: gettext('Interface')
}); });
} }
var ipanel = Ext.create('PVE.panel.InputPanel', { var ipanel = Ext.create('PVE.panel.InputPanel', {
create: me.create, isCreate: me.isCreate,
column1: column1, column1: column1,
column2: [ column2: [
{ {
@ -362,7 +362,7 @@ Ext.define('PVE.FirewallGroupRuleEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -1,14 +1,11 @@
// Ext.create is a function
// but we defined create as a bool in PVE.window.Edit
/*jslint confusion: true*/
Ext.define('PVE.pool.AddVM', { Ext.define('PVE.pool.AddVM', {
extend: 'PVE.window.Edit', extend: 'PVE.window.Edit',
width: 600, width: 600,
height: 400, height: 400,
isAdd: true, isAdd: true,
create: true, isCreate: true,
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;
if (!me.pool) { if (!me.pool) {
@ -26,10 +23,12 @@ Ext.define('PVE.pool.AddVM', {
var vmStore = Ext.create('Ext.data.Store', { var vmStore = Ext.create('Ext.data.Store', {
model: 'PVEResources', model: 'PVEResources',
sorters: { sorters: [
{
property: 'vmid', property: 'vmid',
order: 'ASC' order: 'ASC'
}, }
],
filters: [ filters: [
function(item) { function(item) {
return ((item.data.type === 'lxc' || item.data.type === 'qemu') && item.data.pool === ''); return ((item.data.type === 'lxc' || item.data.type === 'qemu') && item.data.pool === '');
@ -101,14 +100,14 @@ Ext.define('PVE.pool.AddStorage', {
extend: 'PVE.window.Edit', extend: 'PVE.window.Edit',
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;
if (!me.pool) { if (!me.pool) {
throw "no pool specified"; throw "no pool specified";
} }
me.create = true; me.isCreate = true;
me.isAdd = true; me.isAdd = true;
me.url = "/pools/" + me.pool; me.url = "/pools/" + me.pool;
me.method = 'PUT'; me.method = 'PUT';

View File

@ -7,7 +7,7 @@ Ext.define('PVE.ha.GroupInputPanel', {
onGetValues: function(values) { onGetValues: function(values) {
var me = this; var me = this;
if (me.create) { if (me.isCreate) {
values.type = 'group'; values.type = 'group';
} }
@ -151,7 +151,7 @@ Ext.define('PVE.ha.GroupInputPanel', {
me.column1 = [ me.column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'group', name: 'group',
value: me.groupId || '', value: me.groupId || '',
fieldLabel: 'ID', fieldLabel: 'ID',
@ -197,9 +197,9 @@ Ext.define('PVE.ha.GroupEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.groupId; me.isCreate = !me.groupId;
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs/cluster/ha/groups'; me.url = '/api2/extjs/cluster/ha/groups';
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -208,7 +208,7 @@ Ext.define('PVE.ha.GroupEdit', {
} }
var ipanel = Ext.create('PVE.ha.GroupInputPanel', { var ipanel = Ext.create('PVE.ha.GroupInputPanel', {
create: me.create, isCreate: me.isCreate,
groupId: me.groupId groupId: me.groupId
}); });
@ -219,7 +219,7 @@ Ext.define('PVE.ha.GroupEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -6,16 +6,16 @@ Ext.define('PVE.ha.VMResourceInputPanel', {
onGetValues: function(values) { onGetValues: function(values) {
var me = this; var me = this;
if (me.create) { if (me.isCreate) {
values.sid = values.vmid; values.sid = values.vmid;
} }
delete values.vmid; delete values.vmid;
PVE.Utils.delete_if_default(values, 'group', '', me.create); PVE.Utils.delete_if_default(values, 'group', '', me.isCreate);
PVE.Utils.delete_if_default(values, 'max_restart', '1', me.create); PVE.Utils.delete_if_default(values, 'max_restart', '1', me.isCreate);
PVE.Utils.delete_if_default(values, 'max_relocate', '1', me.create); PVE.Utils.delete_if_default(values, 'max_relocate', '1', me.isCreate);
return values; return values;
}, },
@ -151,9 +151,9 @@ Ext.define('PVE.ha.VMResourceEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.vmid; me.isCreate = !me.vmid;
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs/cluster/ha/resources'; me.url = '/api2/extjs/cluster/ha/resources';
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -162,7 +162,7 @@ Ext.define('PVE.ha.VMResourceEdit', {
} }
var ipanel = Ext.create('PVE.ha.VMResourceInputPanel', { var ipanel = Ext.create('PVE.ha.VMResourceInputPanel', {
create: me.create, isCreate: me.isCreate,
vmid: me.vmid, vmid: me.vmid,
guestType: me.guestType guestType: me.guestType
}); });
@ -176,7 +176,7 @@ Ext.define('PVE.ha.VMResourceEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -55,12 +55,10 @@ Ext.define('PVE.lxc.CreateWizard', {
} }
}); });
/*jslint confusion: true */
/* type confusion for 'create' between boolean and function */
var rootfspanel = Ext.create('PVE.lxc.MountPointInputPanel', { var rootfspanel = Ext.create('PVE.lxc.MountPointInputPanel', {
title: gettext('Root Disk'), title: gettext('Root Disk'),
insideWizard: true, insideWizard: true,
create: true, isCreate: true,
unused: false, unused: false,
confid: 'rootfs' confid: 'rootfs'
}); });
@ -69,9 +67,8 @@ Ext.define('PVE.lxc.CreateWizard', {
title: gettext('Network'), title: gettext('Network'),
insideWizard: true, insideWizard: true,
dataCache: {}, dataCache: {},
create: true isCreate: true
}); });
/*jslint confusion: false */
var passwordfield = Ext.createWidget('textfield', { var passwordfield = Ext.createWidget('textfield', {
inputType: 'password', inputType: 'password',

View File

@ -111,7 +111,7 @@ Ext.define('PVE.lxc.DNSEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -23,7 +23,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
var me = this; var me = this;
var id; var id;
if (me.create) { if (me.isCreate) {
id = values.id; id = values.id;
delete values.id; delete values.id;
} else { } else {
@ -60,7 +60,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
cdata.name = 'eth0'; cdata.name = 'eth0';
} }
if (!me.create) { if (!me.isCreate) {
if (!me.ifname) { if (!me.ifname) {
throw "no interface name specified"; throw "no interface name specified";
} }
@ -73,7 +73,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
var i; var i;
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
if (me.create && !me.dataCache['net'+i.toString()]) { if (me.isCreate && !me.dataCache['net'+i.toString()]) {
me.ifname = 'net' + i.toString(); me.ifname = 'net' + i.toString();
break; break;
} }
@ -291,7 +291,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
} }
}); });
/*jslint confusion: true */
Ext.define('PVE.lxc.NetworkEdit', { Ext.define('PVE.lxc.NetworkEdit', {
extend: 'PVE.window.Edit', extend: 'PVE.window.Edit',
@ -312,7 +312,7 @@ Ext.define('PVE.lxc.NetworkEdit', {
ifname: me.ifname, ifname: me.ifname,
nodename: me.nodename, nodename: me.nodename,
dataCache: me.dataCache, dataCache: me.dataCache,
create: me.create isCreate: me.isCreate
}); });
Ext.apply(me, { Ext.apply(me, {
@ -327,7 +327,7 @@ Ext.define('PVE.lxc.NetworkEdit', {
Ext.define('PVE.lxc.NetworkView', { Ext.define('PVE.lxc.NetworkView', {
extend: 'Ext.grid.GridPanel', extend: 'Ext.grid.GridPanel',
alias: ['widget.pveLxcNetworkView'], alias: 'widget.pveLxcNetworkView',
onlineHelp: 'pct_container_network', onlineHelp: 'pct_container_network',
@ -467,7 +467,7 @@ Ext.define('PVE.lxc.NetworkView', {
var win = Ext.create('PVE.lxc.NetworkEdit', { var win = Ext.create('PVE.lxc.NetworkEdit', {
url: me.url, url: me.url,
nodename: nodename, nodename: nodename,
create: true, isCreate: true,
dataCache: me.dataCache dataCache: me.dataCache
}); });
win.on('destroy', me.load, me); win.on('destroy', me.load, me);

View File

@ -49,19 +49,19 @@ Ext.define('PVE.lxc.MountPointEdit', {
var unused = me.confid && me.confid.match(/^unused\d+$/); var unused = me.confid && me.confid.match(/^unused\d+$/);
me.create = me.confid ? unused : true; me.isCreate = me.confid ? unused : true;
var ipanel = Ext.create('PVE.lxc.MountPointInputPanel', { var ipanel = Ext.create('PVE.lxc.MountPointInputPanel', {
confid: me.confid, confid: me.confid,
nodename: nodename, nodename: nodename,
unused: unused, unused: unused,
create: me.create isCreate: me.isCreate
}); });
var subject; var subject;
if (unused) { if (unused) {
subject = gettext('Unused Disk'); subject = gettext('Unused Disk');
} else if (me.create) { } else if (me.isCreate) {
subject = gettext('Mount Point'); subject = gettext('Mount Point');
} else { } else {
subject = gettext('Mount Point') + ' (' + me.confid + ')'; subject = gettext('Mount Point') + ' (' + me.confid + ')';
@ -231,7 +231,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
if (me.unused) { if (me.unused) {
me.mpdata.file = me.vmconfig[values.unusedId]; me.mpdata.file = me.vmconfig[values.unusedId];
confid = values.mpsel; confid = values.mpsel;
} else if (me.create) { } else if (me.isCreate) {
me.mpdata.file = values.storage + ':' + values.disksize; me.mpdata.file = values.storage + ':' + values.disksize;
} }
@ -371,7 +371,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
storageContent: 'rootdir', storageContent: 'rootdir',
allowBlank: false, allowBlank: false,
autoSelect: true, autoSelect: true,
hidden: me.unused || !me.create, hidden: me.unused || !me.isCreate,
listeners: { listeners: {
change: function(f, value) { change: function(f, value) {
if (!value) { // initial store loading fires an unwanted 'change' if (!value) { // initial store loading fires an unwanted 'change'
@ -393,7 +393,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
} else { } else {
me.quota.setDisabled(false); me.quota.setDisabled(false);
} }
if (me.unused || !me.create) { if (me.unused || !me.isCreate) {
return; return;
} }
if (rec.data.type === 'iscsi') { if (rec.data.type === 'iscsi') {
@ -444,7 +444,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', {
} }
}); });
me.column1.push(me.unusedDisks); me.column1.push(me.unusedDisks);
} else if (me.create) { } else if (me.isCreate) {
me.hdfilesel = Ext.create('PVE.form.FileSelector', { me.hdfilesel = Ext.create('PVE.form.FileSelector', {
name: 'file', name: 'file',
nodename: me.nodename, nodename: me.nodename,

View File

@ -14,7 +14,7 @@ Ext.define('PVE.node.NetworkEdit', {
throw "no network device type specified"; throw "no network device type specified";
} }
me.create = !me.iface; me.isCreate = !me.iface;
var iface_vtype; var iface_vtype;
@ -22,9 +22,9 @@ Ext.define('PVE.node.NetworkEdit', {
iface_vtype = 'BridgeName'; iface_vtype = 'BridgeName';
} else if (me.iftype === 'bond') { } else if (me.iftype === 'bond') {
iface_vtype = 'BondName'; iface_vtype = 'BondName';
} else if (me.iftype === 'eth' && !me.create) { } else if (me.iftype === 'eth' && !me.isCreate) {
iface_vtype = 'InterfaceName'; iface_vtype = 'InterfaceName';
} else if (me.iftype === 'vlan' && !me.create) { } else if (me.iftype === 'vlan' && !me.isCreate) {
iface_vtype = 'InterfaceName'; iface_vtype = 'InterfaceName';
} else if (me.iftype === 'OVSBridge') { } else if (me.iftype === 'OVSBridge') {
iface_vtype = 'BridgeName'; iface_vtype = 'BridgeName';
@ -50,7 +50,7 @@ Ext.define('PVE.node.NetworkEdit', {
fieldLabel: gettext('Autostart'), fieldLabel: gettext('Autostart'),
name: 'autostart', name: 'autostart',
uncheckedValue: 0, uncheckedValue: 0,
checked: me.create ? true : undefined checked: me.isCreate ? true : undefined
}); });
} }
@ -59,7 +59,7 @@ Ext.define('PVE.node.NetworkEdit', {
xtype: 'pvecheckbox', xtype: 'pvecheckbox',
fieldLabel: gettext('VLAN aware'), fieldLabel: gettext('VLAN aware'),
name: 'bridge_vlan_aware', name: 'bridge_vlan_aware',
deleteEmpty: !me.create deleteEmpty: !me.isCreate
}); });
column2.push({ column2.push({
xtype: 'textfield', xtype: 'textfield',
@ -79,7 +79,7 @@ Ext.define('PVE.node.NetworkEdit', {
}); });
} else if (me.iftype === 'OVSPort' || me.iftype === 'OVSIntPort') { } else if (me.iftype === 'OVSPort' || me.iftype === 'OVSIntPort') {
column2.push({ column2.push({
xtype: me.create ? 'PVE.form.BridgeSelector' : 'displayfield', xtype: me.isCreate ? 'PVE.form.BridgeSelector' : 'displayfield',
fieldLabel: PVE.Utils.render_network_iface_type('OVSBridge'), fieldLabel: PVE.Utils.render_network_iface_type('OVSBridge'),
allowBlank: false, allowBlank: false,
nodename: nodename, nodename: nodename,
@ -88,7 +88,7 @@ Ext.define('PVE.node.NetworkEdit', {
}); });
column2.push({ column2.push({
xtype: 'pveVlanField', xtype: 'pveVlanField',
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
name: 'ovs_tag', name: 'ovs_tag',
value: '' value: ''
}); });
@ -107,7 +107,7 @@ Ext.define('PVE.node.NetworkEdit', {
var policySelector = Ext.createWidget('bondPolicySelector', { var policySelector = Ext.createWidget('bondPolicySelector', {
fieldLabel: gettext('Hash policy'), fieldLabel: gettext('Hash policy'),
name: 'bond_xmit_hash_policy', name: 'bond_xmit_hash_policy',
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
disabled: true disabled: true
}); });
@ -115,7 +115,7 @@ Ext.define('PVE.node.NetworkEdit', {
xtype: 'bondModeSelector', xtype: 'bondModeSelector',
fieldLabel: gettext('Mode'), fieldLabel: gettext('Mode'),
name: 'bond_mode', name: 'bond_mode',
value: me.create ? 'balance-rr' : undefined, value: me.isCreate ? 'balance-rr' : undefined,
listeners: { listeners: {
change: function(f, value) { change: function(f, value) {
if (value === 'balance-xor' || if (value === 'balance-xor' ||
@ -134,7 +134,7 @@ Ext.define('PVE.node.NetworkEdit', {
} else if (me.iftype === 'OVSBond') { } else if (me.iftype === 'OVSBond') {
column2.push({ column2.push({
xtype: me.create ? 'PVE.form.BridgeSelector' : 'displayfield', xtype: me.isCreate ? 'PVE.form.BridgeSelector' : 'displayfield',
fieldLabel: PVE.Utils.render_network_iface_type('OVSBridge'), fieldLabel: PVE.Utils.render_network_iface_type('OVSBridge'),
allowBlank: false, allowBlank: false,
nodename: nodename, nodename: nodename,
@ -143,7 +143,7 @@ Ext.define('PVE.node.NetworkEdit', {
}); });
column2.push({ column2.push({
xtype: 'pveVlanField', xtype: 'pveVlanField',
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
name: 'ovs_tag', name: 'ovs_tag',
value: '' value: ''
}); });
@ -165,7 +165,7 @@ Ext.define('PVE.node.NetworkEdit', {
var url; var url;
var method; var method;
if (me.create) { if (me.isCreate) {
url = "/api2/extjs/nodes/" + nodename + "/network"; url = "/api2/extjs/nodes/" + nodename + "/network";
method = 'POST'; method = 'POST';
} else { } else {
@ -180,7 +180,7 @@ Ext.define('PVE.node.NetworkEdit', {
value: me.iftype value: me.iftype
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
fieldLabel: gettext('Name'), fieldLabel: gettext('Name'),
name: 'iface', name: 'iface',
value: me.iface, value: me.iface,
@ -196,7 +196,7 @@ Ext.define('PVE.node.NetworkEdit', {
fieldLabel: gettext('Mode'), fieldLabel: gettext('Mode'),
name: 'bond_mode', name: 'bond_mode',
openvswitch: true, openvswitch: true,
value: me.create ? 'active-backup' : undefined, value: me.isCreate ? 'active-backup' : undefined,
allowBlank: false allowBlank: false
}, },
{ {
@ -210,14 +210,14 @@ Ext.define('PVE.node.NetworkEdit', {
column1.push( column1.push(
{ {
xtype: 'pvetextfield', xtype: 'pvetextfield',
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
fieldLabel: gettext('IP address'), fieldLabel: gettext('IP address'),
vtype: 'IPAddress', vtype: 'IPAddress',
name: 'address' name: 'address'
}, },
{ {
xtype: 'pvetextfield', xtype: 'pvetextfield',
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
fieldLabel: gettext('Subnet mask'), fieldLabel: gettext('Subnet mask'),
vtype: 'IPAddress', vtype: 'IPAddress',
name: 'netmask', name: 'netmask',
@ -242,21 +242,21 @@ Ext.define('PVE.node.NetworkEdit', {
}, },
{ {
xtype: 'pvetextfield', xtype: 'pvetextfield',
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
fieldLabel: gettext('Gateway'), fieldLabel: gettext('Gateway'),
vtype: 'IPAddress', vtype: 'IPAddress',
name: 'gateway' name: 'gateway'
}, },
{ {
xtype: 'pvetextfield', xtype: 'pvetextfield',
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
fieldLabel: gettext('IPv6 address'), fieldLabel: gettext('IPv6 address'),
vtype: 'IP6Address', vtype: 'IP6Address',
name: 'address6' name: 'address6'
}, },
{ {
xtype: 'pvetextfield', xtype: 'pvetextfield',
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
fieldLabel: gettext('Prefix length'), fieldLabel: gettext('Prefix length'),
vtype: 'IP6PrefixLength', vtype: 'IP6PrefixLength',
name: 'netmask6', name: 'netmask6',
@ -283,7 +283,7 @@ Ext.define('PVE.node.NetworkEdit', {
}, },
{ {
xtype: 'pvetextfield', xtype: 'pvetextfield',
deleteEmpty: !me.create, deleteEmpty: !me.isCreate,
fieldLabel: gettext('Gateway'), fieldLabel: gettext('Gateway'),
vtype: 'IP6Address', vtype: 'IP6Address',
name: 'gateway6' name: 'gateway6'
@ -303,7 +303,7 @@ Ext.define('PVE.node.NetworkEdit', {
me.callParent(); me.callParent();
if (me.create) { if (me.isCreate) {
me.down('field[name=iface]').setValue(me.iface_default); me.down('field[name=iface]').setValue(me.iface_default);
} else { } else {
me.load({ me.load({

View File

@ -14,7 +14,7 @@ Ext.define('PVE.IPSetList', {
editBtn: undefined, editBtn: undefined,
initComponent: function() { initComponent: function() {
/*jslint confusion: true */
var me = this; var me = this;
if (me.ipset_panel == undefined) { if (me.ipset_panel == undefined) {
@ -178,13 +178,13 @@ Ext.define('PVE.IPSetCidrEdit', {
cidr: undefined, cidr: undefined,
initComponent : function() { initComponent : function() {
/*jslint confusion: true */
var me = this; var me = this;
me.create = (me.cidr === undefined); me.isCreate = (me.cidr === undefined);
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs' + me.base_url; me.url = '/api2/extjs' + me.base_url;
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -194,7 +194,7 @@ Ext.define('PVE.IPSetCidrEdit', {
var column1 = []; var column1 = [];
if (me.create) { if (me.isCreate) {
if (!me.list_refs_url) { if (!me.list_refs_url) {
throw "no alias_base_url specified"; throw "no alias_base_url specified";
} }
@ -219,7 +219,7 @@ Ext.define('PVE.IPSetCidrEdit', {
} }
var ipanel = Ext.create('PVE.panel.InputPanel', { var ipanel = Ext.create('PVE.panel.InputPanel', {
create: me.create, isCreate: me.isCreate,
column1: column1, column1: column1,
column2: [ column2: [
{ {
@ -247,7 +247,7 @@ Ext.define('PVE.IPSetCidrEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -1,5 +1,3 @@
// fixme: howto avoid jslint type confusion?
/*jslint confusion: true */
Ext.define('PVE.qemu.CDInputPanel', { Ext.define('PVE.qemu.CDInputPanel', {
extend: 'PVE.panel.InputPanel', extend: 'PVE.panel.InputPanel',
alias: 'widget.PVE.qemu.CDInputPanel', alias: 'widget.PVE.qemu.CDInputPanel',
@ -158,7 +156,7 @@ Ext.define('PVE.qemu.CDEdit', {
throw "no node name specified"; throw "no node name specified";
} }
me.create = me.confid ? false : true; me.isCreate = me.confid ? false : true;
var ipanel = Ext.create('PVE.qemu.CDInputPanel', { var ipanel = Ext.create('PVE.qemu.CDInputPanel', {
confid: me.confid, confid: me.confid,

View File

@ -25,14 +25,11 @@ Ext.define('PVE.qemu.CreateWizard', {
insideWizard: true insideWizard: true
}); });
/*jslint confusion: true */
/* type confusion for 'create' between boolean and function */
var hdpanel = Ext.create('PVE.qemu.HDInputPanel', { var hdpanel = Ext.create('PVE.qemu.HDInputPanel', {
title: gettext('Hard Disk'), title: gettext('Hard Disk'),
create: true, isCreate: true,
insideWizard: true insideWizard: true
}); });
/*jslint confusion: false */
var networkpanel = Ext.create('PVE.qemu.NetworkInputPanel', { var networkpanel = Ext.create('PVE.qemu.NetworkInputPanel', {
title: gettext('Network'), title: gettext('Network'),

View File

@ -1,5 +1,5 @@
// fixme: howto avoid jslint type confusion?
/*jslint confusion: true */ /*jslint confusion: true */
/* 'change' property is assigned a string and then a function */
Ext.define('PVE.qemu.HDInputPanel', { Ext.define('PVE.qemu.HDInputPanel', {
extend: 'PVE.panel.InputPanel', extend: 'PVE.panel.InputPanel',
alias: 'widget.PVE.qemu.HDInputPanel', alias: 'widget.PVE.qemu.HDInputPanel',
@ -74,7 +74,7 @@ Ext.define('PVE.qemu.HDInputPanel', {
if (me.unused) { if (me.unused) {
me.drive.file = me.vmconfig[values.unusedId]; me.drive.file = me.vmconfig[values.unusedId];
confid = values.controller + values.deviceid; confid = values.controller + values.deviceid;
} else if (me.create) { } else if (me.isCreate) {
if (values.hdimage) { if (values.hdimage) {
me.drive.file = values.hdimage; me.drive.file = values.hdimage;
} else { } else {
@ -188,7 +188,7 @@ Ext.define('PVE.qemu.HDInputPanel', {
allowBlank: false allowBlank: false
}); });
me.column1.push(me.unusedDisks); me.column1.push(me.unusedDisks);
} else if (me.create) { } else if (me.isCreate) {
me.formatsel = Ext.create('PVE.form.DiskFormatSelector', { me.formatsel = Ext.create('PVE.form.DiskFormatSelector', {
name: 'diskformat', name: 'diskformat',
fieldLabel: gettext('Format'), fieldLabel: gettext('Format'),
@ -269,6 +269,7 @@ Ext.define('PVE.qemu.HDInputPanel', {
me.callParent(); me.callParent();
} }
}); });
/*jslint confusion: false */
Ext.define('PVE.qemu.HDEdit', { Ext.define('PVE.qemu.HDEdit', {
extend: 'PVE.window.Edit', extend: 'PVE.window.Edit',
@ -285,19 +286,19 @@ Ext.define('PVE.qemu.HDEdit', {
var unused = me.confid && me.confid.match(/^unused\d+$/); var unused = me.confid && me.confid.match(/^unused\d+$/);
me.create = me.confid ? unused : true; me.isCreate = me.confid ? unused : true;
var ipanel = Ext.create('PVE.qemu.HDInputPanel', { var ipanel = Ext.create('PVE.qemu.HDInputPanel', {
confid: me.confid, confid: me.confid,
nodename: nodename, nodename: nodename,
unused: unused, unused: unused,
create: me.create isCreate: me.isCreate
}); });
var subject; var subject;
if (unused) { if (unused) {
me.subject = gettext('Unused Disk'); me.subject = gettext('Unused Disk');
} else if (me.create) { } else if (me.isCreate) {
me.subject = gettext('Hard Disk'); me.subject = gettext('Hard Disk');
} else { } else {
me.subject = gettext('Hard Disk') + ' (' + me.confid + ')'; me.subject = gettext('Hard Disk') + ' (' + me.confid + ')';
@ -306,7 +307,10 @@ Ext.define('PVE.qemu.HDEdit', {
me.items = [ ipanel ]; me.items = [ ipanel ];
me.callParent(); me.callParent();
/*jslint confusion: true*/
/* 'data' is assigned an empty array in same file, and here we
* use it like an object
*/
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
ipanel.setVMConfig(response.result.data); ipanel.setVMConfig(response.result.data);
@ -323,5 +327,6 @@ Ext.define('PVE.qemu.HDEdit', {
} }
} }
}); });
/*jslint confusion: false*/
} }
}); });

View File

@ -122,16 +122,13 @@ Ext.define('PVE.qemu.EFIDiskEdit', {
throw "no node name specified"; throw "no node name specified";
} }
/*jslint confusion: true */
/* because create is a method above..., really jslint? */
me.items = [{ me.items = [{
xtype: 'pveEFIDiskInputPanel', xtype: 'pveEFIDiskInputPanel',
onlineHelp: 'qm_bios_and_uefi', onlineHelp: 'qm_bios_and_uefi',
confid: me.confid, confid: me.confid,
nodename: nodename, nodename: nodename,
create: true isCreate: true
}]; }];
/* jslint confusion: false */
me.callParent(); me.callParent();
} }

View File

@ -1,5 +1,3 @@
// fixme: howto avoid jslint type confusion?
/*jslint confusion: true */
Ext.define('PVE.qemu.HDThrottleInputPanel', { Ext.define('PVE.qemu.HDThrottleInputPanel', {
extend: 'PVE.panel.InputPanel', extend: 'PVE.panel.InputPanel',
alias: 'widget.PVE.qemu.HDThrottleInputPanel', alias: 'widget.PVE.qemu.HDThrottleInputPanel',
@ -174,7 +172,7 @@ Ext.define('PVE.qemu.HDThrottle', {
var unused = me.confid && me.confid.match(/^unused\d+$/); var unused = me.confid && me.confid.match(/^unused\d+$/);
me.create = me.confid ? unused : true; me.isCreate = me.confid ? unused : true;
var ipanel = Ext.create('PVE.qemu.HDThrottleInputPanel', { var ipanel = Ext.create('PVE.qemu.HDThrottleInputPanel', {
confid: me.confid, confid: me.confid,

View File

@ -183,7 +183,7 @@ Ext.define('PVE.qemu.NetworkEdit', {
throw "no node name specified"; throw "no node name specified";
} }
me.create = me.confid ? false : true; me.isCreate = me.confid ? false : true;
var ipanel = Ext.create('PVE.qemu.NetworkInputPanel', { var ipanel = Ext.create('PVE.qemu.NetworkInputPanel', {
confid: me.confid, confid: me.confid,
@ -201,7 +201,7 @@ Ext.define('PVE.qemu.NetworkEdit', {
success: function(response, options) { success: function(response, options) {
var i, confid; var i, confid;
me.vmconfig = response.result.data; me.vmconfig = response.result.data;
if (!me.create) { if (!me.isCreate) {
var value = me.vmconfig[me.confid]; var value = me.vmconfig[me.confid];
var network = PVE.Parser.parseQemuNetwork(me.confid, value); var network = PVE.Parser.parseQemuNetwork(me.confid, value);
if (!network) { if (!network) {

View File

@ -4,7 +4,7 @@ Ext.define('PVE.storage.DirInputPanel', {
onGetValues: function(values) { onGetValues: function(values) {
var me = this; var me = this;
if (me.create) { if (me.isCreate) {
values.type = 'dir'; values.type = 'dir';
} else { } else {
delete values.storage; delete values.storage;
@ -22,7 +22,7 @@ Ext.define('PVE.storage.DirInputPanel', {
me.column1 = [ me.column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage', name: 'storage',
value: me.storageId || '', value: me.storageId || '',
fieldLabel: 'ID', fieldLabel: 'ID',
@ -30,7 +30,7 @@ Ext.define('PVE.storage.DirInputPanel', {
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'path', name: 'path',
value: '', value: '',
fieldLabel: gettext('Directory'), fieldLabel: gettext('Directory'),
@ -66,12 +66,12 @@ Ext.define('PVE.storage.DirInputPanel', {
name: 'maxfiles', name: 'maxfiles',
minValue: 0, minValue: 0,
maxValue: 365, maxValue: 365,
value: me.create ? '1' : undefined, value: me.isCreate ? '1' : undefined,
allowBlank: false allowBlank: false
} }
]; ];
if (me.create || me.storageId !== 'local') { if (me.isCreate || me.storageId !== 'local') {
me.column2.unshift({ me.column2.unshift({
xtype: 'pveNodeSelector', xtype: 'pveNodeSelector',
name: 'nodes', name: 'nodes',
@ -93,9 +93,9 @@ Ext.define('PVE.storage.DirEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.storageId; me.isCreate = !me.storageId;
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs/storage'; me.url = '/api2/extjs/storage';
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -104,7 +104,7 @@ Ext.define('PVE.storage.DirEdit', {
} }
var ipanel = Ext.create('PVE.storage.DirInputPanel', { var ipanel = Ext.create('PVE.storage.DirInputPanel', {
create: me.create, isCreate: me.isCreate,
storageId: me.storageId storageId: me.storageId
}); });
@ -116,7 +116,7 @@ Ext.define('PVE.storage.DirEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -63,7 +63,7 @@ Ext.define('PVE.storage.GlusterFsInputPanel', {
onGetValues: function(values) { onGetValues: function(values) {
var me = this; var me = this;
if (me.create) { if (me.isCreate) {
values.type = 'glusterfs'; values.type = 'glusterfs';
} else { } else {
delete values.storage; delete values.storage;
@ -81,7 +81,7 @@ Ext.define('PVE.storage.GlusterFsInputPanel', {
me.column1 = [ me.column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage', name: 'storage',
value: me.storageId || '', value: me.storageId || '',
fieldLabel: 'ID', fieldLabel: 'ID',
@ -89,14 +89,14 @@ Ext.define('PVE.storage.GlusterFsInputPanel', {
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'server', name: 'server',
value: '', value: '',
fieldLabel: gettext('Server'), fieldLabel: gettext('Server'),
allowBlank: false, allowBlank: false,
listeners: { listeners: {
change: function(f, value) { change: function(f, value) {
if (me.create) { if (me.isCreate) {
var volumeField = me.down('field[name=volume]'); var volumeField = me.down('field[name=volume]');
volumeField.setServer(value); volumeField.setServer(value);
volumeField.setValue(''); volumeField.setValue('');
@ -105,14 +105,14 @@ Ext.define('PVE.storage.GlusterFsInputPanel', {
} }
}, },
{ {
xtype: me.create ? 'pvetextfield' : 'displayfield', xtype: me.isCreate ? 'pvetextfield' : 'displayfield',
name: 'server2', name: 'server2',
value: '', value: '',
fieldLabel: gettext('Second Server'), fieldLabel: gettext('Second Server'),
allowBlank: true allowBlank: true
}, },
{ {
xtype: me.create ? 'pveGlusterFsScan' : 'displayfield', xtype: me.isCreate ? 'pveGlusterFsScan' : 'displayfield',
name: 'volume', name: 'volume',
value: '', value: '',
fieldLabel: 'Volume name', fieldLabel: 'Volume name',
@ -152,7 +152,7 @@ Ext.define('PVE.storage.GlusterFsInputPanel', {
name: 'maxfiles', name: 'maxfiles',
minValue: 0, minValue: 0,
maxValue: 365, maxValue: 365,
value: me.create ? '1' : undefined, value: me.isCreate ? '1' : undefined,
allowBlank: false allowBlank: false
} }
]; ];
@ -167,9 +167,9 @@ Ext.define('PVE.storage.GlusterFsEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.storageId; me.isCreate = !me.storageId;
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs/storage'; me.url = '/api2/extjs/storage';
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -178,7 +178,7 @@ Ext.define('PVE.storage.GlusterFsEdit', {
} }
var ipanel = Ext.create('PVE.storage.GlusterFsInputPanel', { var ipanel = Ext.create('PVE.storage.GlusterFsInputPanel', {
create: me.create, isCreate: me.isCreate,
storageId: me.storageId storageId: me.storageId
}); });
@ -190,7 +190,7 @@ Ext.define('PVE.storage.GlusterFsEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -62,7 +62,7 @@ Ext.define('PVE.storage.IScsiInputPanel', {
onGetValues: function(values) { onGetValues: function(values) {
var me = this; var me = this;
if (me.create) { if (me.isCreate) {
values.type = 'iscsi'; values.type = 'iscsi';
} else { } else {
delete values.storage; delete values.storage;
@ -83,7 +83,7 @@ Ext.define('PVE.storage.IScsiInputPanel', {
me.column1 = [ me.column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage', name: 'storage',
value: me.storageId || '', value: me.storageId || '',
fieldLabel: 'ID', fieldLabel: 'ID',
@ -91,14 +91,14 @@ Ext.define('PVE.storage.IScsiInputPanel', {
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'portal', name: 'portal',
value: '', value: '',
fieldLabel: 'Portal', fieldLabel: 'Portal',
allowBlank: false, allowBlank: false,
listeners: { listeners: {
change: function(f, value) { change: function(f, value) {
if (me.create) { if (me.isCreate) {
var exportField = me.down('field[name=target]'); var exportField = me.down('field[name=target]');
exportField.setPortal(value); exportField.setPortal(value);
exportField.setValue(''); exportField.setValue('');
@ -107,8 +107,8 @@ Ext.define('PVE.storage.IScsiInputPanel', {
} }
}, },
{ {
readOnly: !me.create, readOnly: !me.isCreate,
xtype: me.create ? 'pveIScsiScan' : 'displayfield', xtype: me.isCreate ? 'pveIScsiScan' : 'displayfield',
name: 'target', name: 'target',
value: '', value: '',
fieldLabel: 'Target', fieldLabel: 'Target',
@ -151,9 +151,9 @@ Ext.define('PVE.storage.IScsiEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.storageId; me.isCreate = !me.storageId;
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs/storage'; me.url = '/api2/extjs/storage';
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -162,7 +162,7 @@ Ext.define('PVE.storage.IScsiEdit', {
} }
var ipanel = Ext.create('PVE.storage.IScsiInputPanel', { var ipanel = Ext.create('PVE.storage.IScsiInputPanel', {
create: me.create, isCreate: me.isCreate,
storageId: me.storageId storageId: me.storageId
}); });
@ -174,7 +174,7 @@ Ext.define('PVE.storage.IScsiEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -89,7 +89,7 @@ Ext.define('PVE.storage.LVMInputPanel', {
onGetValues: function(values) { onGetValues: function(values) {
var me = this; var me = this;
if (me.create) { if (me.isCreate) {
values.type = 'lvm'; values.type = 'lvm';
} else { } else {
delete values.storage; delete values.storage;
@ -106,26 +106,26 @@ Ext.define('PVE.storage.LVMInputPanel', {
me.column1 = [ me.column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage', name: 'storage',
value: me.storageId || '', value: me.storageId || '',
fieldLabel: 'ID', fieldLabel: 'ID',
vtype: 'StorageId', vtype: 'StorageId',
submitValue: !!me.create, submitValue: !!me.isCreate,
allowBlank: false allowBlank: false
} }
]; ];
var vgnameField = Ext.createWidget(me.create ? 'textfield' : 'displayfield', { var vgnameField = Ext.createWidget(me.isCreate ? 'textfield' : 'displayfield', {
name: 'vgname', name: 'vgname',
hidden: !!me.create, hidden: !!me.isCreate,
disabled: !!me.create, disabled: !!me.isCreate,
value: '', value: '',
fieldLabel: gettext('Volume group'), fieldLabel: gettext('Volume group'),
allowBlank: false allowBlank: false
}); });
if (me.create) { if (me.isCreate) {
var vgField = Ext.create('PVE.storage.VgSelector', { var vgField = Ext.create('PVE.storage.VgSelector', {
name: 'vgname', name: 'vgname',
fieldLabel: gettext('Volume group'), fieldLabel: gettext('Volume group'),
@ -225,9 +225,9 @@ Ext.define('PVE.storage.LVMEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.storageId; me.isCreate = !me.storageId;
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs/storage'; me.url = '/api2/extjs/storage';
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -236,7 +236,7 @@ Ext.define('PVE.storage.LVMEdit', {
} }
var ipanel = Ext.create('PVE.storage.LVMInputPanel', { var ipanel = Ext.create('PVE.storage.LVMInputPanel', {
create: me.create, isCreate: me.isCreate,
storageId: me.storageId storageId: me.storageId
}); });
@ -248,7 +248,7 @@ Ext.define('PVE.storage.LVMEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -97,7 +97,7 @@ Ext.define('PVE.storage.LvmThinInputPanel', {
onGetValues: function(values) { onGetValues: function(values) {
var me = this; var me = this;
if (me.create) { if (me.isCreate) {
values.type = 'lvmthin'; values.type = 'lvmthin';
} else { } else {
delete values.storage; delete values.storage;
@ -114,35 +114,35 @@ Ext.define('PVE.storage.LvmThinInputPanel', {
me.column1 = [ me.column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage', name: 'storage',
value: me.storageId || '', value: me.storageId || '',
fieldLabel: 'ID', fieldLabel: 'ID',
vtype: 'StorageId', vtype: 'StorageId',
submitValue: !!me.create, submitValue: !!me.isCreate,
allowBlank: false allowBlank: false
} }
]; ];
var vgnameField = Ext.createWidget(me.create ? 'textfield' : 'displayfield', { var vgnameField = Ext.createWidget(me.isCreate ? 'textfield' : 'displayfield', {
name: 'vgname', name: 'vgname',
hidden: !!me.create, hidden: !!me.isCreate,
disabled: !!me.create, disabled: !!me.isCreate,
value: '', value: '',
fieldLabel: gettext('Volume group'), fieldLabel: gettext('Volume group'),
allowBlank: false allowBlank: false
}); });
var thinpoolField = Ext.createWidget(me.create ? 'textfield' : 'displayfield', { var thinpoolField = Ext.createWidget(me.isCreate ? 'textfield' : 'displayfield', {
name: 'thinpool', name: 'thinpool',
hidden: !!me.create, hidden: !!me.isCreate,
disabled: !!me.create, disabled: !!me.isCreate,
value: '', value: '',
fieldLabel: gettext('Thin Pool'), fieldLabel: gettext('Thin Pool'),
allowBlank: false allowBlank: false
}); });
if (me.create) { if (me.isCreate) {
var vgField = Ext.create('PVE.storage.TPoolSelector', { var vgField = Ext.create('PVE.storage.TPoolSelector', {
name: 'thinpool', name: 'thinpool',
fieldLabel: gettext('Thin Pool'), fieldLabel: gettext('Thin Pool'),
@ -155,7 +155,7 @@ Ext.define('PVE.storage.LvmThinInputPanel', {
fieldLabel: gettext('Volume group'), fieldLabel: gettext('Volume group'),
listeners: { listeners: {
change: function(f, value) { change: function(f, value) {
if (me.create) { if (me.isCreate) {
vgField.setVG(value); vgField.setVG(value);
vgField.setValue(''); vgField.setValue('');
} }
@ -213,9 +213,9 @@ Ext.define('PVE.storage.LvmThinEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.storageId; me.isCreate = !me.storageId;
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs/storage'; me.url = '/api2/extjs/storage';
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -224,7 +224,7 @@ Ext.define('PVE.storage.LvmThinEdit', {
} }
var ipanel = Ext.create('PVE.storage.LvmThinInputPanel', { var ipanel = Ext.create('PVE.storage.LvmThinInputPanel', {
create: me.create, isCreate: me.isCreate,
storageId: me.storageId storageId: me.storageId
}); });
@ -236,7 +236,7 @@ Ext.define('PVE.storage.LvmThinEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -63,7 +63,7 @@ Ext.define('PVE.storage.NFSInputPanel', {
onGetValues: function(values) { onGetValues: function(values) {
var me = this; var me = this;
if (me.create) { if (me.isCreate) {
values.type = 'nfs'; values.type = 'nfs';
// hack: for now we always create nvf v3 // hack: for now we always create nvf v3
// fixme: make this configurable // fixme: make this configurable
@ -84,7 +84,7 @@ Ext.define('PVE.storage.NFSInputPanel', {
me.column1 = [ me.column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage', name: 'storage',
value: me.storageId || '', value: me.storageId || '',
fieldLabel: 'ID', fieldLabel: 'ID',
@ -92,14 +92,14 @@ Ext.define('PVE.storage.NFSInputPanel', {
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'server', name: 'server',
value: '', value: '',
fieldLabel: gettext('Server'), fieldLabel: gettext('Server'),
allowBlank: false, allowBlank: false,
listeners: { listeners: {
change: function(f, value) { change: function(f, value) {
if (me.create) { if (me.isCreate) {
var exportField = me.down('field[name=export]'); var exportField = me.down('field[name=export]');
exportField.setServer(value); exportField.setServer(value);
exportField.setValue(''); exportField.setValue('');
@ -108,7 +108,7 @@ Ext.define('PVE.storage.NFSInputPanel', {
} }
}, },
{ {
xtype: me.create ? 'pveNFSScan' : 'displayfield', xtype: me.isCreate ? 'pveNFSScan' : 'displayfield',
name: 'export', name: 'export',
value: '', value: '',
fieldLabel: 'Export', fieldLabel: 'Export',
@ -147,7 +147,7 @@ Ext.define('PVE.storage.NFSInputPanel', {
name: 'maxfiles', name: 'maxfiles',
minValue: 0, minValue: 0,
maxValue: 365, maxValue: 365,
value: me.create ? '1' : undefined, value: me.isCreate ? '1' : undefined,
allowBlank: false allowBlank: false
} }
]; ];
@ -162,9 +162,9 @@ Ext.define('PVE.storage.NFSEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.storageId; me.isCreate = !me.storageId;
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs/storage'; me.url = '/api2/extjs/storage';
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -173,7 +173,7 @@ Ext.define('PVE.storage.NFSEdit', {
} }
var ipanel = Ext.create('PVE.storage.NFSInputPanel', { var ipanel = Ext.create('PVE.storage.NFSInputPanel', {
create: me.create, isCreate: me.isCreate,
storageId: me.storageId storageId: me.storageId
}); });
@ -185,7 +185,7 @@ Ext.define('PVE.storage.NFSEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -4,7 +4,7 @@ Ext.define('PVE.storage.RBDInputPanel', {
onGetValues: function(values) { onGetValues: function(values) {
var me = this; var me = this;
if (me.create) { if (me.isCreate) {
values.type = 'rbd'; values.type = 'rbd';
} else { } else {
delete values.storage; delete values.storage;
@ -22,7 +22,7 @@ Ext.define('PVE.storage.RBDInputPanel', {
me.column1 = [ me.column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage', name: 'storage',
value: me.storageId || '', value: me.storageId || '',
fieldLabel: 'ID', fieldLabel: 'ID',
@ -30,14 +30,14 @@ Ext.define('PVE.storage.RBDInputPanel', {
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'pool', name: 'pool',
value: 'rbd', value: 'rbd',
fieldLabel: gettext('Pool'), fieldLabel: gettext('Pool'),
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'monhost', name: 'monhost',
vtype: 'HostList', vtype: 'HostList',
value: '', value: '',
@ -45,7 +45,7 @@ Ext.define('PVE.storage.RBDInputPanel', {
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'username', name: 'username',
value: 'admin', value: 'admin',
fieldLabel: gettext('User name'), fieldLabel: gettext('User name'),
@ -82,7 +82,7 @@ Ext.define('PVE.storage.RBDInputPanel', {
]; ];
/*jslint confusion: false*/ /*jslint confusion: false*/
if (me.create || me.storageId !== 'local') { if (me.isCreate || me.storageId !== 'local') {
me.column2.unshift({ me.column2.unshift({
xtype: 'pveNodeSelector', xtype: 'pveNodeSelector',
name: 'nodes', name: 'nodes',
@ -104,9 +104,9 @@ Ext.define('PVE.storage.RBDEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.storageId; me.isCreate = !me.storageId;
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs/storage'; me.url = '/api2/extjs/storage';
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -115,7 +115,7 @@ Ext.define('PVE.storage.RBDEdit', {
} }
var ipanel = Ext.create('PVE.storage.RBDInputPanel', { var ipanel = Ext.create('PVE.storage.RBDInputPanel', {
create: me.create, isCreate: me.isCreate,
storageId: me.storageId storageId: me.storageId
}); });
@ -127,7 +127,7 @@ Ext.define('PVE.storage.RBDEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -4,7 +4,7 @@ Ext.define('PVE.storage.SheepdogInputPanel', {
onGetValues: function(values) { onGetValues: function(values) {
var me = this; var me = this;
if (me.create) { if (me.isCreate) {
values.type = 'sheepdog'; values.type = 'sheepdog';
values.content = 'images'; values.content = 'images';
@ -24,7 +24,7 @@ Ext.define('PVE.storage.SheepdogInputPanel', {
me.column1 = [ me.column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage', name: 'storage',
value: me.storageId || '', value: me.storageId || '',
fieldLabel: 'ID', fieldLabel: 'ID',
@ -32,7 +32,7 @@ Ext.define('PVE.storage.SheepdogInputPanel', {
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'portal', name: 'portal',
value: '127.0.0.1:7000', value: '127.0.0.1:7000',
fieldLabel: gettext('Gateway'), fieldLabel: gettext('Gateway'),
@ -50,7 +50,7 @@ Ext.define('PVE.storage.SheepdogInputPanel', {
} }
]; ];
if (me.create || me.storageId !== 'local') { if (me.isCreate || me.storageId !== 'local') {
me.column2.unshift({ me.column2.unshift({
xtype: 'pveNodeSelector', xtype: 'pveNodeSelector',
name: 'nodes', name: 'nodes',
@ -72,9 +72,9 @@ Ext.define('PVE.storage.SheepdogEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.storageId; me.isCreate = !me.storageId;
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs/storage'; me.url = '/api2/extjs/storage';
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -83,7 +83,7 @@ Ext.define('PVE.storage.SheepdogEdit', {
} }
var ipanel = Ext.create('PVE.storage.SheepdogInputPanel', { var ipanel = Ext.create('PVE.storage.SheepdogInputPanel', {
create: me.create, isCreate: me.isCreate,
storageId: me.storageId storageId: me.storageId
}); });
@ -95,7 +95,7 @@ Ext.define('PVE.storage.SheepdogEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -4,7 +4,7 @@ Ext.define('PVE.storage.ZFSInputPanel', {
onGetValues: function(values) { onGetValues: function(values) {
var me = this; var me = this;
if (me.create) { if (me.isCreate) {
values.type = 'zfs'; values.type = 'zfs';
values.content = 'images'; values.content = 'images';
} else { } else {
@ -22,7 +22,7 @@ Ext.define('PVE.storage.ZFSInputPanel', {
me.column1 = [ me.column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage', name: 'storage',
value: me.storageId || '', value: me.storageId || '',
fieldLabel: 'ID', fieldLabel: 'ID',
@ -30,35 +30,35 @@ Ext.define('PVE.storage.ZFSInputPanel', {
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'portal', name: 'portal',
value: '', value: '',
fieldLabel: gettext('Portal'), fieldLabel: gettext('Portal'),
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'pool', name: 'pool',
value: '', value: '',
fieldLabel: gettext('Pool'), fieldLabel: gettext('Pool'),
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'blocksize', name: 'blocksize',
value: '4k', value: '4k',
fieldLabel: gettext('Block Size'), fieldLabel: gettext('Block Size'),
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'target', name: 'target',
value: '', value: '',
fieldLabel: gettext('Target'), fieldLabel: gettext('Target'),
allowBlank: false allowBlank: false
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'comstar_tg', name: 'comstar_tg',
value: '', value: '',
fieldLabel: gettext('Target group'), fieldLabel: gettext('Target group'),
@ -75,7 +75,7 @@ Ext.define('PVE.storage.ZFSInputPanel', {
fieldLabel: gettext('Enable') fieldLabel: gettext('Enable')
}, },
{ {
xtype: me.create ? 'pveiScsiProviderSelector' : 'displayfield', xtype: me.isCreate ? 'pveiScsiProviderSelector' : 'displayfield',
name: 'iscsiprovider', name: 'iscsiprovider',
value: 'comstar', value: 'comstar',
fieldLabel: gettext('iSCSI Provider'), fieldLabel: gettext('iSCSI Provider'),
@ -96,7 +96,7 @@ Ext.define('PVE.storage.ZFSInputPanel', {
fieldLabel: gettext('Write cache') fieldLabel: gettext('Write cache')
}, },
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'comstar_hg', name: 'comstar_hg',
value: '', value: '',
fieldLabel: gettext('Host group'), fieldLabel: gettext('Host group'),
@ -104,7 +104,7 @@ Ext.define('PVE.storage.ZFSInputPanel', {
} }
]; ];
if (me.create || me.storageId !== 'local') { if (me.isCreate || me.storageId !== 'local') {
me.column2.unshift({ me.column2.unshift({
xtype: 'pveNodeSelector', xtype: 'pveNodeSelector',
name: 'nodes', name: 'nodes',
@ -126,9 +126,9 @@ Ext.define('PVE.storage.ZFSEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.storageId; me.isCreate = !me.storageId;
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs/storage'; me.url = '/api2/extjs/storage';
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -137,7 +137,7 @@ Ext.define('PVE.storage.ZFSEdit', {
} }
var ipanel = Ext.create('PVE.storage.ZFSInputPanel', { var ipanel = Ext.create('PVE.storage.ZFSInputPanel', {
create: me.create, isCreate: me.isCreate,
storageId: me.storageId storageId: me.storageId
}); });
@ -149,7 +149,7 @@ Ext.define('PVE.storage.ZFSEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -40,7 +40,7 @@ Ext.define('PVE.storage.ZFSPoolInputPanel', {
onGetValues: function(values) { onGetValues: function(values) {
var me = this; var me = this;
if (me.create) { if (me.isCreate) {
values.type = 'zfspool'; values.type = 'zfspool';
} else { } else {
delete values.storage; delete values.storage;
@ -57,7 +57,7 @@ Ext.define('PVE.storage.ZFSPoolInputPanel', {
me.column1 = [ me.column1 = [
{ {
xtype: me.create ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage', name: 'storage',
value: me.storageId || '', value: me.storageId || '',
fieldLabel: 'ID', fieldLabel: 'ID',
@ -66,7 +66,7 @@ Ext.define('PVE.storage.ZFSPoolInputPanel', {
} }
]; ];
if (me.create) { if (me.isCreate) {
me.column1.push(Ext.create('PVE.storage.ZFSPoolSelector', { me.column1.push(Ext.create('PVE.storage.ZFSPoolSelector', {
name: 'pool', name: 'pool',
fieldLabel: gettext('ZFS Pool'), fieldLabel: gettext('ZFS Pool'),
@ -118,7 +118,7 @@ Ext.define('PVE.storage.ZFSPoolInputPanel', {
} }
]; ];
if (me.create || me.storageId !== 'local') { if (me.isCreate || me.storageId !== 'local') {
me.column2.unshift({ me.column2.unshift({
xtype: 'pveNodeSelector', xtype: 'pveNodeSelector',
name: 'nodes', name: 'nodes',
@ -140,9 +140,9 @@ Ext.define('PVE.storage.ZFSPoolEdit', {
initComponent : function() { initComponent : function() {
var me = this; var me = this;
me.create = !me.storageId; me.isCreate = !me.storageId;
if (me.create) { if (me.isCreate) {
me.url = '/api2/extjs/storage'; me.url = '/api2/extjs/storage';
me.method = 'POST'; me.method = 'POST';
} else { } else {
@ -151,7 +151,7 @@ Ext.define('PVE.storage.ZFSPoolEdit', {
} }
var ipanel = Ext.create('PVE.storage.ZFSPoolInputPanel', { var ipanel = Ext.create('PVE.storage.ZFSPoolInputPanel', {
create: me.create, isCreate: me.isCreate,
storageId: me.storageId storageId: me.storageId
}); });
@ -163,7 +163,7 @@ Ext.define('PVE.storage.ZFSPoolEdit', {
me.callParent(); me.callParent();
if (!me.create) { if (!me.isCreate) {
me.load({ me.load({
success: function(response, options) { success: function(response, options) {
var values = response.result.data; var values = response.result.data;

View File

@ -1,5 +1,3 @@
// fixme: how can we avoid those lint errors?
/*jslint confusion: true */
Ext.define('PVE.window.Edit', { Ext.define('PVE.window.Edit', {
extend: 'Ext.window.Window', extend: 'Ext.window.Window',
alias: 'widget.pveWindowEdit', alias: 'widget.pveWindowEdit',
@ -10,9 +8,9 @@ Ext.define('PVE.window.Edit', {
// Create: <subject> // Create: <subject>
subject: undefined, subject: undefined,
// set create to true if you want a Create button (instead // set isCreate to true if you want a Create button (instead of
// OK and RESET) // OK and RESET)
create: false, isCreate: false,
// set to true if you want an Add button (instead of Create) // set to true if you want an Add button (instead of Create)
isAdd: false, isAdd: false,
@ -184,6 +182,8 @@ Ext.define('PVE.window.Edit', {
throw "no url specified"; throw "no url specified";
} }
if (me.create) {throw "deprecated parameter, use isCreate";}
var items = Ext.isArray(me.items) ? me.items : [ me.items ]; var items = Ext.isArray(me.items) ? me.items : [ me.items ];
me.items = undefined; me.items = undefined;
@ -207,7 +207,7 @@ Ext.define('PVE.window.Edit', {
var form = me.formPanel.getForm(); var form = me.formPanel.getForm();
var submitText; var submitText;
if (me.create) { if (me.isCreate) {
if (me.isAdd) { if (me.isAdd) {
submitText = gettext('Add'); submitText = gettext('Add');
} else if (me.isRemove) { } else if (me.isRemove) {
@ -221,7 +221,7 @@ Ext.define('PVE.window.Edit', {
var submitBtn = Ext.create('Ext.Button', { var submitBtn = Ext.create('Ext.Button', {
text: submitText, text: submitText,
disabled: !me.create, disabled: !me.isCreate,
handler: function() { handler: function() {
me.submit(); me.submit();
} }
@ -238,7 +238,7 @@ Ext.define('PVE.window.Edit', {
var set_button_status = function() { var set_button_status = function() {
var valid = form.isValid(); var valid = form.isValid();
var dirty = form.isDirty(); var dirty = form.isDirty();
submitBtn.setDisabled(!valid || !(dirty || me.create)); submitBtn.setDisabled(!valid || !(dirty || me.isCreate));
resetBtn.setDisabled(!dirty); resetBtn.setDisabled(!dirty);
}; };
@ -254,10 +254,10 @@ Ext.define('PVE.window.Edit', {
var twoColumn = items[0].column1 || items[0].column2; var twoColumn = items[0].column1 || items[0].column2;
if (me.subject && !me.title) { if (me.subject && !me.title) {
me.title = PVE.Utils.dialog_title(me.subject, me.create, me.isAdd); me.title = PVE.Utils.dialog_title(me.subject, me.isCreate, me.isAdd);
} }
if (me.create) { if (me.isCreate) {
me.buttons = [ submitBtn ] ; me.buttons = [ submitBtn ] ;
} else { } else {
me.buttons = [ submitBtn, resetBtn ]; me.buttons = [ submitBtn, resetBtn ];