This fixes around 20 jslint type confusion warnings.
Also reduce the scope and document jslint warnings along the way.
No functional changes.
38 files changed:
},
initComponent : function() {
},
initComponent : function() {
- /*jslint confusion: true */
var me = this;
if (!me.nodename) {
var me = this;
if (!me.nodename) {
Ext.applyIf(me, {
method: 'POST',
Ext.applyIf(me, {
method: 'POST',
showProgress: true,
initComponent : function() {
showProgress: true,
initComponent : function() {
- /*jslint confusion: true */
var me = this;
if (!me.nodename) {
throw "no node name specified";
}
var me = this;
if (!me.nodename) {
throw "no node name specified";
}
Ext.applyIf(me, {
url: "/nodes/" + me.nodename + "/ceph/osd",
Ext.applyIf(me, {
url: "/nodes/" + me.nodename + "/ceph/osd",
}
],
initComponent : function() {
}
],
initComponent : function() {
- /*jslint confusion: true */
var me = this;
if (!me.nodename) {
var me = this;
if (!me.nodename) {
throw "no osdid specified";
}
throw "no osdid specified";
}
- me.title = gettext('Remove') + ': ' + 'Ceph OSD osd.' + me.osdid;
+ me.title = gettext('Remove') + ': ' + 'Ceph OSD osd.' + me.osdid.toString();
- url: "/nodes/" + me.nodename + "/ceph/osd/" + me.osdid
+ url: "/nodes/" + me.nodename + "/ceph/osd/" + me.osdid.toString()
-// Ext.create is a function, but
-// we defined create a bool in PVE.window.Edit
-/*jslint confusion: true*/
Ext.define('PVE.CephCreatePool', {
extend: 'PVE.window.Edit',
alias: ['widget.pveCephCreatePool'],
subject: 'Ceph Pool',
Ext.define('PVE.CephCreatePool', {
extend: 'PVE.window.Edit',
alias: ['widget.pveCephCreatePool'],
subject: 'Ceph Pool',
method: 'POST',
items: [
{
method: 'POST',
items: [
{
method: 'PUT',
isAdd: true,
initComponent : function() {
method: 'PUT',
isAdd: true,
initComponent : function() {
- /*jslint confusion: true */
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
+ me.isCreate = !me.realm;
var url;
var method;
var serverlist;
var url;
var method;
var serverlist;
url = '/api2/extjs/access/domains';
method = 'POST';
} else {
url = '/api2/extjs/access/domains';
method = 'POST';
} else {
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'realm',
fieldLabel: gettext('Realm'),
value: me.realm,
name: 'realm',
fieldLabel: gettext('Realm'),
value: me.realm,
});
} else if (me.authType === 'pve') {
});
} else if (me.authType === 'pve') {
throw 'unknown auth type';
}
throw 'unknown auth type';
}
} else if (me.authType === 'pam') {
} else if (me.authType === 'pam') {
throw 'unknown auth type';
}
throw 'unknown auth type';
}
{
xtype: 'pvetextfield',
fieldLabel: gettext('Fallback Server'),
{
xtype: 'pvetextfield',
fieldLabel: gettext('Fallback Server'),
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
column2.push({
xtype: 'pveKVComboBox',
name: 'tfa',
column2.push({
xtype: 'pveKVComboBox',
name: 'tfa',
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
value: '',
fieldLabel: gettext('TFA'),
comboItems: [ ['__default__', PVE.Utils.noneText], ['oath', 'OATH'], ['yubico', 'Yubico']],
value: '',
fieldLabel: gettext('TFA'),
comboItems: [ ['__default__', PVE.Utils.noneText], ['oath', 'OATH'], ['yubico', 'Yubico']],
}],
onGetValues: function(values) {
if (!values.port) {
}],
onGetValues: function(values) {
if (!values.port) {
PVE.Utils.assemble_field_data(values, { 'delete': 'port' });
}
delete values.port;
}
PVE.Utils.assemble_field_data(values, { 'delete': 'port' });
}
delete values.port;
}
values.type = me.authType;
}
values.type = me.authType;
}
me.load({
success: function(response, options) {
var data = response.result.data || {};
me.load({
success: function(response, options) {
var data = response.result.data || {};
alias: ['widget.pveDcBackupEdit'],
initComponent : function() {
alias: ['widget.pveDcBackupEdit'],
initComponent : function() {
- /*jslint confusion: true */
+ me.isCreate = !me.jobid;
url = '/api2/extjs/cluster/backup';
method = 'POST';
} else {
url = '/api2/extjs/cluster/backup';
method = 'POST';
} else {
+ /*jslint confusion: true*/
+ // 'value' can be assigned a string or an array
var selModeField = Ext.create('PVE.form.KVComboBox', {
xtype: 'pveKVComboBox',
comboItems: [
var selModeField = Ext.create('PVE.form.KVComboBox', {
xtype: 'pveKVComboBox',
comboItems: [
xtype: 'pveEmailNotificationSelector',
fieldLabel: gettext('Email notification'),
name: 'mailnotification',
xtype: 'pveEmailNotificationSelector',
fieldLabel: gettext('Email notification'),
name: 'mailnotification',
- deleteEmpty: me.create ? false : true,
- value: me.create ? 'always' : ''
+ deleteEmpty: me.isCreate ? false : true,
+ value: me.isCreate ? 'always' : ''
},
{
xtype: 'pveCompressionSelector',
fieldLabel: gettext('Compression'),
name: 'compress',
},
{
xtype: 'pveCompressionSelector',
fieldLabel: gettext('Compression'),
name: 'compress',
- deleteEmpty: me.create ? false : true,
+ deleteEmpty: me.isCreate ? false : true,
+ /*jslint confusion: false*/
var ipanel = Ext.create('PVE.panel.InputPanel', {
column1: column1,
column2: column2,
onGetValues: function(values) {
if (!values.node) {
var ipanel = Ext.create('PVE.panel.InputPanel', {
column1: column1,
column2: column2,
onGetValues: function(values) {
if (!values.node) {
PVE.Utils.assemble_field_data(values, { 'delete': 'node' });
}
delete values.node;
PVE.Utils.assemble_field_data(values, { 'delete': 'node' });
}
delete values.node;
selModeField.setValue('include');
} else {
me.load({
selModeField.setValue('include');
} else {
me.load({
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.groupid;
+ me.isCreate = !me.groupid;
url = '/api2/extjs/access/groups';
method = 'POST';
} else {
url = '/api2/extjs/access/groups';
method = 'POST';
} else {
method: method,
items: [
{
method: method,
items: [
{
- xtype: me.create ? 'pvetextfield' : 'displayfield',
+ xtype: me.isCreate ? 'pvetextfield' : 'displayfield',
fieldLabel: gettext('Name'),
name: 'groupid',
value: me.groupid,
fieldLabel: gettext('Name'),
name: 'groupid',
value: me.groupid,
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.poolid;
+ me.isCreate = !me.poolid;
url = '/api2/extjs/pools';
method = 'POST';
} else {
url = '/api2/extjs/pools';
method = 'POST';
} else {
method: method,
items: [
{
method: method,
items: [
{
- xtype: me.create ? 'pvetextfield' : 'displayfield',
+ xtype: me.isCreate ? 'pvetextfield' : 'displayfield',
fieldLabel: gettext('Name'),
name: 'poolid',
value: me.poolid,
fieldLabel: gettext('Name'),
name: 'poolid',
value: me.poolid,
allow_iface: false,
initComponent : function() {
allow_iface: false,
initComponent : function() {
- /*jslint confusion: true */
- me.create = (me.group_name === undefined);
+ me.isCreate = (me.group_name === undefined);
subject = gettext('Security Group');
} else {
subject = gettext('Security Group') + " '" + me.group_name + "'";
subject = gettext('Security Group');
} else {
subject = gettext('Security Group') + " '" + me.group_name + "'";
}
var ipanel = Ext.create('PVE.panel.InputPanel', {
}
var ipanel = Ext.create('PVE.panel.InputPanel', {
+ // InputPanel does not have a 'create' property, does it need a 'isCreate'
+ isCreate: me.isCreate,
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.userid;
+ me.isCreate = !me.userid;
var url;
var method;
var realm;
var url;
var method;
var realm;
url = '/api2/extjs/access/users';
method = 'POST';
} else {
url = '/api2/extjs/access/users';
method = 'POST';
} else {
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'userid',
fieldLabel: gettext('User name'),
value: me.userid,
allowBlank: false,
name: 'userid',
fieldLabel: gettext('User name'),
value: me.userid,
allowBlank: false,
- submitValue: me.create ? true : false
+ submitValue: me.isCreate ? true : false
column1.splice(1,0,{
xtype: 'pveRealmComboBox',
name: 'realm',
column1.splice(1,0,{
xtype: 'pveRealmComboBox',
name: 'realm',
me.load({
success: function(response, options) {
var data = response.result.data;
me.load({
success: function(response, options) {
var data = response.result.data;
alias_name: undefined,
initComponent : function() {
alias_name: undefined,
initComponent : function() {
- /*jslint confusion: true */
- me.create = (me.alias_name === undefined);
+ me.isCreate = (me.alias_name === undefined);
me.url = '/api2/extjs' + me.base_url;
me.method = 'POST';
} else {
me.url = '/api2/extjs' + me.base_url;
me.method = 'POST';
} else {
var items = [
{
xtype: 'textfield',
var items = [
{
xtype: 'textfield',
- name: me.create ? 'name' : 'rename',
+ name: me.isCreate ? 'name' : 'rename',
fieldLabel: gettext('Name'),
allowBlank: false
},
fieldLabel: gettext('Name'),
allowBlank: false
},
];
var ipanel = Ext.create('PVE.panel.InputPanel', {
];
var ipanel = Ext.create('PVE.panel.InputPanel', {
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
title: gettext('Alias'),
initComponent : function() {
title: gettext('Alias'),
initComponent : function() {
- /*jslint confusion: true */
me.column1.push({
xtype: 'pvetextfield',
name: 'iface',
me.column1.push({
xtype: 'pvetextfield',
name: 'iface',
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
value: '',
fieldLabel: gettext('Interface')
});
value: '',
fieldLabel: gettext('Interface')
});
allow_iface: false,
initComponent : function() {
allow_iface: false,
initComponent : function() {
- /*jslint confusion: true */
var me = this;
if (!me.base_url) {
var me = this;
if (!me.base_url) {
throw "no list_refs_url specified";
}
throw "no list_refs_url specified";
}
- me.create = (me.rule_pos === undefined);
+ me.isCreate = (me.rule_pos === undefined);
me.url = '/api2/extjs' + me.base_url;
me.method = 'POST';
} else {
me.url = '/api2/extjs' + me.base_url;
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.FirewallRulePanel', {
}
var ipanel = Ext.create('PVE.FirewallRulePanel', {
list_refs_url: me.list_refs_url,
allow_iface: me.allow_iface,
rule_pos: me.rule_pos
list_refs_url: me.list_refs_url,
allow_iface: me.allow_iface,
rule_pos: me.rule_pos
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
allow_iface: false,
initComponent : function() {
allow_iface: false,
initComponent : function() {
- /*jslint confusion: true */
- me.create = (me.rule_pos === undefined);
+ me.isCreate = (me.rule_pos === undefined);
me.url = '/api2/extjs' + me.base_url;
me.method = 'POST';
} else {
me.url = '/api2/extjs' + me.base_url;
me.method = 'POST';
} else {
column1.push({
xtype: 'pvetextfield',
name: 'iface',
column1.push({
xtype: 'pvetextfield',
name: 'iface',
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
value: '',
fieldLabel: gettext('Interface')
});
}
var ipanel = Ext.create('PVE.panel.InputPanel', {
value: '',
fieldLabel: gettext('Interface')
});
}
var ipanel = Ext.create('PVE.panel.InputPanel', {
column1: column1,
column2: [
{
column1: column1,
column2: [
{
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
-// Ext.create is a function
-// but we defined create as a bool in PVE.window.Edit
-/*jslint confusion: true*/
Ext.define('PVE.pool.AddVM', {
extend: 'PVE.window.Edit',
width: 600,
height: 400,
isAdd: true,
Ext.define('PVE.pool.AddVM', {
extend: 'PVE.window.Edit',
width: 600,
height: 400,
isAdd: true,
initComponent : function() {
initComponent : function() {
- /*jslint confusion: true */
var me = this;
if (!me.pool) {
var me = this;
if (!me.pool) {
var vmStore = Ext.create('Ext.data.Store', {
model: 'PVEResources',
var vmStore = Ext.create('Ext.data.Store', {
model: 'PVEResources',
- sorters: {
- property: 'vmid',
- order: 'ASC'
- },
+ sorters: [
+ {
+ property: 'vmid',
+ order: 'ASC'
+ }
+ ],
filters: [
function(item) {
return ((item.data.type === 'lxc' || item.data.type === 'qemu') && item.data.pool === '');
filters: [
function(item) {
return ((item.data.type === 'lxc' || item.data.type === 'qemu') && item.data.pool === '');
extend: 'PVE.window.Edit',
initComponent : function() {
extend: 'PVE.window.Edit',
initComponent : function() {
- /*jslint confusion: true */
var me = this;
if (!me.pool) {
throw "no pool specified";
}
var me = this;
if (!me.pool) {
throw "no pool specified";
}
me.isAdd = true;
me.url = "/pools/" + me.pool;
me.method = 'PUT';
me.isAdd = true;
me.url = "/pools/" + me.pool;
me.method = 'PUT';
onGetValues: function(values) {
var me = this;
onGetValues: function(values) {
var me = this;
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'group',
value: me.groupId || '',
fieldLabel: 'ID',
name: 'group',
value: me.groupId || '',
fieldLabel: 'ID',
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.groupId;
+ me.isCreate = !me.groupId;
me.url = '/api2/extjs/cluster/ha/groups';
me.method = 'POST';
} else {
me.url = '/api2/extjs/cluster/ha/groups';
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.ha.GroupInputPanel', {
}
var ipanel = Ext.create('PVE.ha.GroupInputPanel', {
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
onGetValues: function(values) {
var me = this;
onGetValues: function(values) {
var me = this;
values.sid = values.vmid;
}
delete values.vmid;
values.sid = values.vmid;
}
delete values.vmid;
- PVE.Utils.delete_if_default(values, 'group', '', me.create);
- PVE.Utils.delete_if_default(values, 'max_restart', '1', me.create);
- PVE.Utils.delete_if_default(values, 'max_relocate', '1', me.create);
+ PVE.Utils.delete_if_default(values, 'group', '', me.isCreate);
+ PVE.Utils.delete_if_default(values, 'max_restart', '1', me.isCreate);
+ PVE.Utils.delete_if_default(values, 'max_relocate', '1', me.isCreate);
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
+ me.isCreate = !me.vmid;
me.url = '/api2/extjs/cluster/ha/resources';
me.method = 'POST';
} else {
me.url = '/api2/extjs/cluster/ha/resources';
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.ha.VMResourceInputPanel', {
}
var ipanel = Ext.create('PVE.ha.VMResourceInputPanel', {
vmid: me.vmid,
guestType: me.guestType
});
vmid: me.vmid,
guestType: me.guestType
});
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
- /*jslint confusion: true */
- /* type confusion for 'create' between boolean and function */
var rootfspanel = Ext.create('PVE.lxc.MountPointInputPanel', {
title: gettext('Root Disk'),
insideWizard: true,
var rootfspanel = Ext.create('PVE.lxc.MountPointInputPanel', {
title: gettext('Root Disk'),
insideWizard: true,
unused: false,
confid: 'rootfs'
});
unused: false,
confid: 'rootfs'
});
title: gettext('Network'),
insideWizard: true,
dataCache: {},
title: gettext('Network'),
insideWizard: true,
dataCache: {},
- /*jslint confusion: false */
var passwordfield = Ext.createWidget('textfield', {
inputType: 'password',
var passwordfield = Ext.createWidget('textfield', {
inputType: 'password',
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
id = values.id;
delete values.id;
} else {
id = values.id;
delete values.id;
} else {
if (!me.ifname) {
throw "no interface name specified";
}
if (!me.ifname) {
throw "no interface name specified";
}
var i;
for (i = 0; i < 10; i++) {
var 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();
break;
}
me.ifname = 'net' + i.toString();
break;
}
-/*jslint confusion: true */
Ext.define('PVE.lxc.NetworkEdit', {
extend: 'PVE.window.Edit',
Ext.define('PVE.lxc.NetworkEdit', {
extend: 'PVE.window.Edit',
ifname: me.ifname,
nodename: me.nodename,
dataCache: me.dataCache,
ifname: me.ifname,
nodename: me.nodename,
dataCache: me.dataCache,
Ext.define('PVE.lxc.NetworkView', {
extend: 'Ext.grid.GridPanel',
Ext.define('PVE.lxc.NetworkView', {
extend: 'Ext.grid.GridPanel',
- alias: ['widget.pveLxcNetworkView'],
+ alias: 'widget.pveLxcNetworkView',
onlineHelp: 'pct_container_network',
onlineHelp: 'pct_container_network',
var win = Ext.create('PVE.lxc.NetworkEdit', {
url: me.url,
nodename: nodename,
var win = Ext.create('PVE.lxc.NetworkEdit', {
url: me.url,
nodename: nodename,
dataCache: me.dataCache
});
win.on('destroy', me.load, me);
dataCache: me.dataCache
});
win.on('destroy', me.load, me);
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', {
confid: me.confid,
nodename: nodename,
unused: unused,
var ipanel = Ext.create('PVE.lxc.MountPointInputPanel', {
confid: me.confid,
nodename: nodename,
unused: unused,
});
var subject;
if (unused) {
subject = gettext('Unused Disk');
});
var subject;
if (unused) {
subject = gettext('Unused Disk');
- } else if (me.create) {
+ } else if (me.isCreate) {
subject = gettext('Mount Point');
} else {
subject = gettext('Mount Point') + ' (' + me.confid + ')';
subject = gettext('Mount Point');
} else {
subject = gettext('Mount Point') + ' (' + me.confid + ')';
if (me.unused) {
me.mpdata.file = me.vmconfig[values.unusedId];
confid = values.mpsel;
if (me.unused) {
me.mpdata.file = me.vmconfig[values.unusedId];
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;
}
storageContent: 'rootdir',
allowBlank: false,
autoSelect: true,
storageContent: 'rootdir',
allowBlank: false,
autoSelect: true,
- hidden: me.unused || !me.create,
+ hidden: me.unused || !me.isCreate,
listeners: {
change: function(f, value) {
if (!value) { // initial store loading fires an unwanted 'change'
listeners: {
change: function(f, value) {
if (!value) { // initial store loading fires an unwanted 'change'
} else {
me.quota.setDisabled(false);
}
} else {
me.quota.setDisabled(false);
}
- if (me.unused || !me.create) {
+ if (me.unused || !me.isCreate) {
return;
}
if (rec.data.type === 'iscsi') {
return;
}
if (rec.data.type === 'iscsi') {
}
});
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', {
name: 'file',
nodename: me.nodename,
me.hdfilesel = Ext.create('PVE.form.FileSelector', {
name: 'file',
nodename: me.nodename,
throw "no network device type specified";
}
throw "no network device type specified";
}
+ me.isCreate = !me.iface;
iface_vtype = 'BridgeName';
} else if (me.iftype === 'bond') {
iface_vtype = 'BondName';
iface_vtype = 'BridgeName';
} else if (me.iftype === 'bond') {
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';
} else if (me.iftype === 'OVSBridge') {
iface_vtype = 'BridgeName';
iface_vtype = 'InterfaceName';
} else if (me.iftype === 'OVSBridge') {
iface_vtype = 'BridgeName';
fieldLabel: gettext('Autostart'),
name: 'autostart',
uncheckedValue: 0,
fieldLabel: gettext('Autostart'),
name: 'autostart',
uncheckedValue: 0,
- checked: me.create ? true : undefined
+ checked: me.isCreate ? true : undefined
xtype: 'pvecheckbox',
fieldLabel: gettext('VLAN aware'),
name: 'bridge_vlan_aware',
xtype: 'pvecheckbox',
fieldLabel: gettext('VLAN aware'),
name: 'bridge_vlan_aware',
- deleteEmpty: !me.create
+ deleteEmpty: !me.isCreate
});
column2.push({
xtype: 'textfield',
});
column2.push({
xtype: 'textfield',
});
} else if (me.iftype === 'OVSPort' || me.iftype === 'OVSIntPort') {
column2.push({
});
} else if (me.iftype === 'OVSPort' || me.iftype === 'OVSIntPort') {
column2.push({
- xtype: me.create ? 'PVE.form.BridgeSelector' : 'displayfield',
+ xtype: me.isCreate ? 'PVE.form.BridgeSelector' : 'displayfield',
fieldLabel: PVE.Utils.render_network_iface_type('OVSBridge'),
allowBlank: false,
nodename: nodename,
fieldLabel: PVE.Utils.render_network_iface_type('OVSBridge'),
allowBlank: false,
nodename: nodename,
});
column2.push({
xtype: 'pveVlanField',
});
column2.push({
xtype: 'pveVlanField',
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
name: 'ovs_tag',
value: ''
});
name: 'ovs_tag',
value: ''
});
var policySelector = Ext.createWidget('bondPolicySelector', {
fieldLabel: gettext('Hash policy'),
name: 'bond_xmit_hash_policy',
var policySelector = Ext.createWidget('bondPolicySelector', {
fieldLabel: gettext('Hash policy'),
name: 'bond_xmit_hash_policy',
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
xtype: 'bondModeSelector',
fieldLabel: gettext('Mode'),
name: 'bond_mode',
xtype: 'bondModeSelector',
fieldLabel: gettext('Mode'),
name: 'bond_mode',
- value: me.create ? 'balance-rr' : undefined,
+ value: me.isCreate ? 'balance-rr' : undefined,
listeners: {
change: function(f, value) {
if (value === 'balance-xor' ||
listeners: {
change: function(f, value) {
if (value === 'balance-xor' ||
} else if (me.iftype === 'OVSBond') {
column2.push({
} else if (me.iftype === 'OVSBond') {
column2.push({
- xtype: me.create ? 'PVE.form.BridgeSelector' : 'displayfield',
+ xtype: me.isCreate ? 'PVE.form.BridgeSelector' : 'displayfield',
fieldLabel: PVE.Utils.render_network_iface_type('OVSBridge'),
allowBlank: false,
nodename: nodename,
fieldLabel: PVE.Utils.render_network_iface_type('OVSBridge'),
allowBlank: false,
nodename: nodename,
});
column2.push({
xtype: 'pveVlanField',
});
column2.push({
xtype: 'pveVlanField',
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
name: 'ovs_tag',
value: ''
});
name: 'ovs_tag',
value: ''
});
url = "/api2/extjs/nodes/" + nodename + "/network";
method = 'POST';
} else {
url = "/api2/extjs/nodes/" + nodename + "/network";
method = 'POST';
} else {
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
fieldLabel: gettext('Name'),
name: 'iface',
value: me.iface,
fieldLabel: gettext('Name'),
name: 'iface',
value: me.iface,
fieldLabel: gettext('Mode'),
name: 'bond_mode',
openvswitch: true,
fieldLabel: gettext('Mode'),
name: 'bond_mode',
openvswitch: true,
- value: me.create ? 'active-backup' : undefined,
+ value: me.isCreate ? 'active-backup' : undefined,
column1.push(
{
xtype: 'pvetextfield',
column1.push(
{
xtype: 'pvetextfield',
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
fieldLabel: gettext('IP address'),
vtype: 'IPAddress',
name: 'address'
},
{
xtype: 'pvetextfield',
fieldLabel: gettext('IP address'),
vtype: 'IPAddress',
name: 'address'
},
{
xtype: 'pvetextfield',
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
fieldLabel: gettext('Subnet mask'),
vtype: 'IPAddress',
name: 'netmask',
fieldLabel: gettext('Subnet mask'),
vtype: 'IPAddress',
name: 'netmask',
},
{
xtype: 'pvetextfield',
},
{
xtype: 'pvetextfield',
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
fieldLabel: gettext('Gateway'),
vtype: 'IPAddress',
name: 'gateway'
},
{
xtype: 'pvetextfield',
fieldLabel: gettext('Gateway'),
vtype: 'IPAddress',
name: 'gateway'
},
{
xtype: 'pvetextfield',
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
fieldLabel: gettext('IPv6 address'),
vtype: 'IP6Address',
name: 'address6'
},
{
xtype: 'pvetextfield',
fieldLabel: gettext('IPv6 address'),
vtype: 'IP6Address',
name: 'address6'
},
{
xtype: 'pvetextfield',
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
fieldLabel: gettext('Prefix length'),
vtype: 'IP6PrefixLength',
name: 'netmask6',
fieldLabel: gettext('Prefix length'),
vtype: 'IP6PrefixLength',
name: 'netmask6',
},
{
xtype: 'pvetextfield',
},
{
xtype: 'pvetextfield',
- deleteEmpty: !me.create,
+ deleteEmpty: !me.isCreate,
fieldLabel: gettext('Gateway'),
vtype: 'IP6Address',
name: 'gateway6'
fieldLabel: gettext('Gateway'),
vtype: 'IP6Address',
name: 'gateway6'
me.down('field[name=iface]').setValue(me.iface_default);
} else {
me.load({
me.down('field[name=iface]').setValue(me.iface_default);
} else {
me.load({
editBtn: undefined,
initComponent: function() {
editBtn: undefined,
initComponent: function() {
- /*jslint confusion: true */
var me = this;
if (me.ipset_panel == undefined) {
var me = this;
if (me.ipset_panel == undefined) {
cidr: undefined,
initComponent : function() {
cidr: undefined,
initComponent : function() {
- /*jslint confusion: true */
- me.create = (me.cidr === undefined);
+ me.isCreate = (me.cidr === undefined);
me.url = '/api2/extjs' + me.base_url;
me.method = 'POST';
} else {
me.url = '/api2/extjs' + me.base_url;
me.method = 'POST';
} else {
if (!me.list_refs_url) {
throw "no alias_base_url specified";
}
if (!me.list_refs_url) {
throw "no alias_base_url specified";
}
}
var ipanel = Ext.create('PVE.panel.InputPanel', {
}
var ipanel = Ext.create('PVE.panel.InputPanel', {
column1: column1,
column2: [
{
column1: column1,
column2: [
{
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
-// fixme: howto avoid jslint type confusion?
-/*jslint confusion: true */
Ext.define('PVE.qemu.CDInputPanel', {
extend: 'PVE.panel.InputPanel',
alias: 'widget.PVE.qemu.CDInputPanel',
Ext.define('PVE.qemu.CDInputPanel', {
extend: 'PVE.panel.InputPanel',
alias: 'widget.PVE.qemu.CDInputPanel',
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', {
confid: me.confid,
var ipanel = Ext.create('PVE.qemu.CDInputPanel', {
confid: me.confid,
- /*jslint confusion: true */
- /* type confusion for 'create' between boolean and function */
var hdpanel = Ext.create('PVE.qemu.HDInputPanel', {
title: gettext('Hard Disk'),
var hdpanel = Ext.create('PVE.qemu.HDInputPanel', {
title: gettext('Hard Disk'),
- /*jslint confusion: false */
var networkpanel = Ext.create('PVE.qemu.NetworkInputPanel', {
title: gettext('Network'),
var networkpanel = Ext.create('PVE.qemu.NetworkInputPanel', {
title: gettext('Network'),
-// 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', {
extend: 'PVE.panel.InputPanel',
alias: 'widget.PVE.qemu.HDInputPanel',
Ext.define('PVE.qemu.HDInputPanel', {
extend: 'PVE.panel.InputPanel',
alias: 'widget.PVE.qemu.HDInputPanel',
if (me.unused) {
me.drive.file = me.vmconfig[values.unusedId];
confid = values.controller + values.deviceid;
if (me.unused) {
me.drive.file = me.vmconfig[values.unusedId];
confid = values.controller + values.deviceid;
- } else if (me.create) {
+ } else if (me.isCreate) {
if (values.hdimage) {
me.drive.file = values.hdimage;
} else {
if (values.hdimage) {
me.drive.file = values.hdimage;
} else {
allowBlank: false
});
me.column1.push(me.unusedDisks);
allowBlank: false
});
me.column1.push(me.unusedDisks);
- } else if (me.create) {
+ } else if (me.isCreate) {
me.formatsel = Ext.create('PVE.form.DiskFormatSelector', {
name: 'diskformat',
fieldLabel: gettext('Format'),
me.formatsel = Ext.create('PVE.form.DiskFormatSelector', {
name: 'diskformat',
fieldLabel: gettext('Format'),
+/*jslint confusion: false */
Ext.define('PVE.qemu.HDEdit', {
extend: 'PVE.window.Edit',
Ext.define('PVE.qemu.HDEdit', {
extend: 'PVE.window.Edit',
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', {
confid: me.confid,
nodename: nodename,
unused: unused,
var ipanel = Ext.create('PVE.qemu.HDInputPanel', {
confid: me.confid,
nodename: nodename,
unused: unused,
});
var subject;
if (unused) {
me.subject = gettext('Unused Disk');
});
var subject;
if (unused) {
me.subject = gettext('Unused Disk');
- } else if (me.create) {
+ } else if (me.isCreate) {
me.subject = gettext('Hard Disk');
} else {
me.subject = gettext('Hard Disk') + ' (' + me.confid + ')';
me.subject = gettext('Hard Disk');
} else {
me.subject = gettext('Hard Disk') + ' (' + me.confid + ')';
me.items = [ ipanel ];
me.callParent();
me.items = [ ipanel ];
me.callParent();
+ /*jslint confusion: true*/
+ /* 'data' is assigned an empty array in same file, and here we
+ * use it like an object
+ */
me.load({
success: function(response, options) {
ipanel.setVMConfig(response.result.data);
me.load({
success: function(response, options) {
ipanel.setVMConfig(response.result.data);
+ /*jslint confusion: false*/
throw "no node name specified";
}
throw "no node name specified";
}
- /*jslint confusion: true */
- /* because create is a method above..., really jslint? */
me.items = [{
xtype: 'pveEFIDiskInputPanel',
onlineHelp: 'qm_bios_and_uefi',
confid: me.confid,
nodename: nodename,
me.items = [{
xtype: 'pveEFIDiskInputPanel',
onlineHelp: 'qm_bios_and_uefi',
confid: me.confid,
nodename: nodename,
- /* jslint confusion: false */
-// fixme: howto avoid jslint type confusion?
-/*jslint confusion: true */
Ext.define('PVE.qemu.HDThrottleInputPanel', {
extend: 'PVE.panel.InputPanel',
alias: 'widget.PVE.qemu.HDThrottleInputPanel',
Ext.define('PVE.qemu.HDThrottleInputPanel', {
extend: 'PVE.panel.InputPanel',
alias: 'widget.PVE.qemu.HDThrottleInputPanel',
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', {
confid: me.confid,
var ipanel = Ext.create('PVE.qemu.HDThrottleInputPanel', {
confid: me.confid,
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', {
confid: me.confid,
var ipanel = Ext.create('PVE.qemu.NetworkInputPanel', {
confid: me.confid,
success: function(response, options) {
var i, confid;
me.vmconfig = response.result.data;
success: function(response, options) {
var i, confid;
me.vmconfig = response.result.data;
var value = me.vmconfig[me.confid];
var network = PVE.Parser.parseQemuNetwork(me.confid, value);
if (!network) {
var value = me.vmconfig[me.confid];
var network = PVE.Parser.parseQemuNetwork(me.confid, value);
if (!network) {
onGetValues: function(values) {
var me = this;
onGetValues: function(values) {
var me = this;
values.type = 'dir';
} else {
delete values.storage;
values.type = 'dir';
} else {
delete values.storage;
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'path',
value: '',
fieldLabel: gettext('Directory'),
name: 'path',
value: '',
fieldLabel: gettext('Directory'),
name: 'maxfiles',
minValue: 0,
maxValue: 365,
name: 'maxfiles',
minValue: 0,
maxValue: 365,
- value: me.create ? '1' : undefined,
+ value: me.isCreate ? '1' : undefined,
- if (me.create || me.storageId !== 'local') {
+ if (me.isCreate || me.storageId !== 'local') {
me.column2.unshift({
xtype: 'pveNodeSelector',
name: 'nodes',
me.column2.unshift({
xtype: 'pveNodeSelector',
name: 'nodes',
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.storageId;
+ me.isCreate = !me.storageId;
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.storage.DirInputPanel', {
}
var ipanel = Ext.create('PVE.storage.DirInputPanel', {
storageId: me.storageId
});
storageId: me.storageId
});
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
onGetValues: function(values) {
var me = this;
onGetValues: function(values) {
var me = this;
values.type = 'glusterfs';
} else {
delete values.storage;
values.type = 'glusterfs';
} else {
delete values.storage;
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'server',
value: '',
fieldLabel: gettext('Server'),
allowBlank: false,
listeners: {
change: function(f, value) {
name: 'server',
value: '',
fieldLabel: gettext('Server'),
allowBlank: false,
listeners: {
change: function(f, value) {
var volumeField = me.down('field[name=volume]');
volumeField.setServer(value);
volumeField.setValue('');
var volumeField = me.down('field[name=volume]');
volumeField.setServer(value);
volumeField.setValue('');
- xtype: me.create ? 'pvetextfield' : 'displayfield',
+ xtype: me.isCreate ? 'pvetextfield' : 'displayfield',
name: 'server2',
value: '',
fieldLabel: gettext('Second Server'),
allowBlank: true
},
{
name: 'server2',
value: '',
fieldLabel: gettext('Second Server'),
allowBlank: true
},
{
- xtype: me.create ? 'pveGlusterFsScan' : 'displayfield',
+ xtype: me.isCreate ? 'pveGlusterFsScan' : 'displayfield',
name: 'volume',
value: '',
fieldLabel: 'Volume name',
name: 'volume',
value: '',
fieldLabel: 'Volume name',
name: 'maxfiles',
minValue: 0,
maxValue: 365,
name: 'maxfiles',
minValue: 0,
maxValue: 365,
- value: me.create ? '1' : undefined,
+ value: me.isCreate ? '1' : undefined,
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.storageId;
+ me.isCreate = !me.storageId;
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.storage.GlusterFsInputPanel', {
}
var ipanel = Ext.create('PVE.storage.GlusterFsInputPanel', {
storageId: me.storageId
});
storageId: me.storageId
});
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
onGetValues: function(values) {
var me = this;
onGetValues: function(values) {
var me = this;
values.type = 'iscsi';
} else {
delete values.storage;
values.type = 'iscsi';
} else {
delete values.storage;
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'portal',
value: '',
fieldLabel: 'Portal',
allowBlank: false,
listeners: {
change: function(f, value) {
name: 'portal',
value: '',
fieldLabel: 'Portal',
allowBlank: false,
listeners: {
change: function(f, value) {
var exportField = me.down('field[name=target]');
exportField.setPortal(value);
exportField.setValue('');
var exportField = me.down('field[name=target]');
exportField.setPortal(value);
exportField.setValue('');
- readOnly: !me.create,
- xtype: me.create ? 'pveIScsiScan' : 'displayfield',
+ readOnly: !me.isCreate,
+ xtype: me.isCreate ? 'pveIScsiScan' : 'displayfield',
name: 'target',
value: '',
fieldLabel: 'Target',
name: 'target',
value: '',
fieldLabel: 'Target',
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.storageId;
+ me.isCreate = !me.storageId;
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.storage.IScsiInputPanel', {
}
var ipanel = Ext.create('PVE.storage.IScsiInputPanel', {
storageId: me.storageId
});
storageId: me.storageId
});
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
onGetValues: function(values) {
var me = this;
onGetValues: function(values) {
var me = this;
values.type = 'lvm';
} else {
delete values.storage;
values.type = 'lvm';
} else {
delete values.storage;
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
- submitValue: !!me.create,
+ submitValue: !!me.isCreate,
- var vgnameField = Ext.createWidget(me.create ? 'textfield' : 'displayfield', {
+ var vgnameField = Ext.createWidget(me.isCreate ? 'textfield' : 'displayfield', {
- hidden: !!me.create,
- disabled: !!me.create,
+ hidden: !!me.isCreate,
+ disabled: !!me.isCreate,
value: '',
fieldLabel: gettext('Volume group'),
allowBlank: false
});
value: '',
fieldLabel: gettext('Volume group'),
allowBlank: false
});
var vgField = Ext.create('PVE.storage.VgSelector', {
name: 'vgname',
fieldLabel: gettext('Volume group'),
var vgField = Ext.create('PVE.storage.VgSelector', {
name: 'vgname',
fieldLabel: gettext('Volume group'),
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.storageId;
+ me.isCreate = !me.storageId;
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.storage.LVMInputPanel', {
}
var ipanel = Ext.create('PVE.storage.LVMInputPanel', {
storageId: me.storageId
});
storageId: me.storageId
});
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
onGetValues: function(values) {
var me = this;
onGetValues: function(values) {
var me = this;
values.type = 'lvmthin';
} else {
delete values.storage;
values.type = 'lvmthin';
} else {
delete values.storage;
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
vtype: 'StorageId',
- submitValue: !!me.create,
+ submitValue: !!me.isCreate,
- var vgnameField = Ext.createWidget(me.create ? 'textfield' : 'displayfield', {
+ var vgnameField = Ext.createWidget(me.isCreate ? 'textfield' : 'displayfield', {
- hidden: !!me.create,
- disabled: !!me.create,
+ hidden: !!me.isCreate,
+ disabled: !!me.isCreate,
value: '',
fieldLabel: gettext('Volume group'),
allowBlank: false
});
value: '',
fieldLabel: gettext('Volume group'),
allowBlank: false
});
- var thinpoolField = Ext.createWidget(me.create ? 'textfield' : 'displayfield', {
+ var thinpoolField = Ext.createWidget(me.isCreate ? 'textfield' : 'displayfield', {
- hidden: !!me.create,
- disabled: !!me.create,
+ hidden: !!me.isCreate,
+ disabled: !!me.isCreate,
value: '',
fieldLabel: gettext('Thin Pool'),
allowBlank: false
});
value: '',
fieldLabel: gettext('Thin Pool'),
allowBlank: false
});
var vgField = Ext.create('PVE.storage.TPoolSelector', {
name: 'thinpool',
fieldLabel: gettext('Thin Pool'),
var vgField = Ext.create('PVE.storage.TPoolSelector', {
name: 'thinpool',
fieldLabel: gettext('Thin Pool'),
fieldLabel: gettext('Volume group'),
listeners: {
change: function(f, value) {
fieldLabel: gettext('Volume group'),
listeners: {
change: function(f, value) {
vgField.setVG(value);
vgField.setValue('');
}
vgField.setVG(value);
vgField.setValue('');
}
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.storageId;
+ me.isCreate = !me.storageId;
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.storage.LvmThinInputPanel', {
}
var ipanel = Ext.create('PVE.storage.LvmThinInputPanel', {
storageId: me.storageId
});
storageId: me.storageId
});
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
onGetValues: function(values) {
var me = this;
onGetValues: function(values) {
var me = this;
values.type = 'nfs';
// hack: for now we always create nvf v3
// fixme: make this configurable
values.type = 'nfs';
// hack: for now we always create nvf v3
// fixme: make this configurable
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'server',
value: '',
fieldLabel: gettext('Server'),
allowBlank: false,
listeners: {
change: function(f, value) {
name: 'server',
value: '',
fieldLabel: gettext('Server'),
allowBlank: false,
listeners: {
change: function(f, value) {
var exportField = me.down('field[name=export]');
exportField.setServer(value);
exportField.setValue('');
var exportField = me.down('field[name=export]');
exportField.setServer(value);
exportField.setValue('');
- xtype: me.create ? 'pveNFSScan' : 'displayfield',
+ xtype: me.isCreate ? 'pveNFSScan' : 'displayfield',
name: 'export',
value: '',
fieldLabel: 'Export',
name: 'export',
value: '',
fieldLabel: 'Export',
name: 'maxfiles',
minValue: 0,
maxValue: 365,
name: 'maxfiles',
minValue: 0,
maxValue: 365,
- value: me.create ? '1' : undefined,
+ value: me.isCreate ? '1' : undefined,
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.storageId;
+ me.isCreate = !me.storageId;
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.storage.NFSInputPanel', {
}
var ipanel = Ext.create('PVE.storage.NFSInputPanel', {
storageId: me.storageId
});
storageId: me.storageId
});
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
onGetValues: function(values) {
var me = this;
onGetValues: function(values) {
var me = this;
values.type = 'rbd';
} else {
delete values.storage;
values.type = 'rbd';
} else {
delete values.storage;
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'pool',
value: 'rbd',
fieldLabel: gettext('Pool'),
allowBlank: false
},
{
name: 'pool',
value: 'rbd',
fieldLabel: gettext('Pool'),
allowBlank: false
},
{
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'monhost',
vtype: 'HostList',
value: '',
name: 'monhost',
vtype: 'HostList',
value: '',
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'username',
value: 'admin',
fieldLabel: gettext('User name'),
name: 'username',
value: 'admin',
fieldLabel: gettext('User name'),
];
/*jslint confusion: false*/
];
/*jslint confusion: false*/
- if (me.create || me.storageId !== 'local') {
+ if (me.isCreate || me.storageId !== 'local') {
me.column2.unshift({
xtype: 'pveNodeSelector',
name: 'nodes',
me.column2.unshift({
xtype: 'pveNodeSelector',
name: 'nodes',
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.storageId;
+ me.isCreate = !me.storageId;
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.storage.RBDInputPanel', {
}
var ipanel = Ext.create('PVE.storage.RBDInputPanel', {
storageId: me.storageId
});
storageId: me.storageId
});
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
onGetValues: function(values) {
var me = this;
onGetValues: function(values) {
var me = this;
values.type = 'sheepdog';
values.content = 'images';
values.type = 'sheepdog';
values.content = 'images';
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'portal',
value: '127.0.0.1:7000',
fieldLabel: gettext('Gateway'),
name: 'portal',
value: '127.0.0.1:7000',
fieldLabel: gettext('Gateway'),
- if (me.create || me.storageId !== 'local') {
+ if (me.isCreate || me.storageId !== 'local') {
me.column2.unshift({
xtype: 'pveNodeSelector',
name: 'nodes',
me.column2.unshift({
xtype: 'pveNodeSelector',
name: 'nodes',
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.storageId;
+ me.isCreate = !me.storageId;
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.storage.SheepdogInputPanel', {
}
var ipanel = Ext.create('PVE.storage.SheepdogInputPanel', {
storageId: me.storageId
});
storageId: me.storageId
});
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
onGetValues: function(values) {
var me = this;
onGetValues: function(values) {
var me = this;
values.type = 'zfs';
values.content = 'images';
} else {
values.type = 'zfs';
values.content = 'images';
} else {
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'portal',
value: '',
fieldLabel: gettext('Portal'),
allowBlank: false
},
{
name: 'portal',
value: '',
fieldLabel: gettext('Portal'),
allowBlank: false
},
{
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'pool',
value: '',
fieldLabel: gettext('Pool'),
allowBlank: false
},
{
name: 'pool',
value: '',
fieldLabel: gettext('Pool'),
allowBlank: false
},
{
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'blocksize',
value: '4k',
fieldLabel: gettext('Block Size'),
allowBlank: false
},
{
name: 'blocksize',
value: '4k',
fieldLabel: gettext('Block Size'),
allowBlank: false
},
{
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'target',
value: '',
fieldLabel: gettext('Target'),
allowBlank: false
},
{
name: 'target',
value: '',
fieldLabel: gettext('Target'),
allowBlank: false
},
{
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'comstar_tg',
value: '',
fieldLabel: gettext('Target group'),
name: 'comstar_tg',
value: '',
fieldLabel: gettext('Target group'),
fieldLabel: gettext('Enable')
},
{
fieldLabel: gettext('Enable')
},
{
- xtype: me.create ? 'pveiScsiProviderSelector' : 'displayfield',
+ xtype: me.isCreate ? 'pveiScsiProviderSelector' : 'displayfield',
name: 'iscsiprovider',
value: 'comstar',
fieldLabel: gettext('iSCSI Provider'),
name: 'iscsiprovider',
value: 'comstar',
fieldLabel: gettext('iSCSI Provider'),
fieldLabel: gettext('Write cache')
},
{
fieldLabel: gettext('Write cache')
},
{
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'comstar_hg',
value: '',
fieldLabel: gettext('Host group'),
name: 'comstar_hg',
value: '',
fieldLabel: gettext('Host group'),
- if (me.create || me.storageId !== 'local') {
+ if (me.isCreate || me.storageId !== 'local') {
me.column2.unshift({
xtype: 'pveNodeSelector',
name: 'nodes',
me.column2.unshift({
xtype: 'pveNodeSelector',
name: 'nodes',
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.storageId;
+ me.isCreate = !me.storageId;
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.storage.ZFSInputPanel', {
}
var ipanel = Ext.create('PVE.storage.ZFSInputPanel', {
storageId: me.storageId
});
storageId: me.storageId
});
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
onGetValues: function(values) {
var me = this;
onGetValues: function(values) {
var me = this;
values.type = 'zfspool';
} else {
delete values.storage;
values.type = 'zfspool';
} else {
delete values.storage;
- xtype: me.create ? 'textfield' : 'displayfield',
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
name: 'storage',
value: me.storageId || '',
fieldLabel: 'ID',
me.column1.push(Ext.create('PVE.storage.ZFSPoolSelector', {
name: 'pool',
fieldLabel: gettext('ZFS Pool'),
me.column1.push(Ext.create('PVE.storage.ZFSPoolSelector', {
name: 'pool',
fieldLabel: gettext('ZFS Pool'),
- if (me.create || me.storageId !== 'local') {
+ if (me.isCreate || me.storageId !== 'local') {
me.column2.unshift({
xtype: 'pveNodeSelector',
name: 'nodes',
me.column2.unshift({
xtype: 'pveNodeSelector',
name: 'nodes',
initComponent : function() {
var me = this;
initComponent : function() {
var me = this;
- me.create = !me.storageId;
+ me.isCreate = !me.storageId;
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
me.url = '/api2/extjs/storage';
me.method = 'POST';
} else {
}
var ipanel = Ext.create('PVE.storage.ZFSPoolInputPanel', {
}
var ipanel = Ext.create('PVE.storage.ZFSPoolInputPanel', {
storageId: me.storageId
});
storageId: me.storageId
});
me.load({
success: function(response, options) {
var values = response.result.data;
me.load({
success: function(response, options) {
var values = response.result.data;
-// fixme: how can we avoid those lint errors?
-/*jslint confusion: true */
Ext.define('PVE.window.Edit', {
extend: 'Ext.window.Window',
alias: 'widget.pveWindowEdit',
Ext.define('PVE.window.Edit', {
extend: 'Ext.window.Window',
alias: 'widget.pveWindowEdit',
// Create: <subject>
subject: undefined,
// Create: <subject>
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
// set to true if you want an Add button (instead of Create)
isAdd: false,
// set to true if you want an Add button (instead of Create)
isAdd: false,
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 ];
me.items = undefined;
var items = Ext.isArray(me.items) ? me.items : [ me.items ];
me.items = undefined;
var form = me.formPanel.getForm();
var submitText;
var form = me.formPanel.getForm();
var submitText;
if (me.isAdd) {
submitText = gettext('Add');
} else if (me.isRemove) {
if (me.isAdd) {
submitText = gettext('Add');
} else if (me.isRemove) {
var submitBtn = Ext.create('Ext.Button', {
text: submitText,
var submitBtn = Ext.create('Ext.Button', {
text: submitText,
+ disabled: !me.isCreate,
handler: function() {
me.submit();
}
handler: function() {
me.submit();
}
var set_button_status = function() {
var valid = form.isValid();
var dirty = form.isDirty();
var set_button_status = function() {
var valid = form.isValid();
var dirty = form.isDirty();
- submitBtn.setDisabled(!valid || !(dirty || me.create));
+ submitBtn.setDisabled(!valid || !(dirty || me.isCreate));
resetBtn.setDisabled(!dirty);
};
resetBtn.setDisabled(!dirty);
};
var twoColumn = items[0].column1 || items[0].column2;
if (me.subject && !me.title) {
var twoColumn = items[0].column1 || items[0].column2;
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);
me.buttons = [ submitBtn ] ;
} else {
me.buttons = [ submitBtn, resetBtn ];
me.buttons = [ submitBtn ] ;
} else {
me.buttons = [ submitBtn, resetBtn ];