From f6710aac3881d63d8761444c13a0f3643b9e8ba2 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 19 Jan 2021 17:31:03 +0100 Subject: [PATCH] ui: eslint: fix trailing comma and comma related whitespaces errors Signed-off-by: Thomas Lamprecht --- www/manager6/Parser.js | 6 +- www/manager6/StateProvider.js | 6 +- www/manager6/Toolkit.js | 4 +- www/manager6/Utils.js | 74 ++++---- www/manager6/VNCConsole.js | 6 +- www/manager6/Workspace.js | 78 ++++---- www/manager6/button/ConsoleButton.js | 12 +- www/manager6/button/Revert.js | 2 +- www/manager6/button/Split.js | 4 +- www/manager6/ceph/CephInstallWizard.js | 90 ++++----- www/manager6/ceph/Config.js | 28 +-- www/manager6/ceph/Crush.js | 10 +- www/manager6/ceph/FS.js | 66 +++---- www/manager6/ceph/Log.js | 4 +- www/manager6/ceph/Monitor.js | 16 +- www/manager6/ceph/Pool.js | 72 +++---- www/manager6/ceph/ServiceList.js | 64 +++---- www/manager6/ceph/Services.js | 70 +++---- www/manager6/ceph/Status.js | 108 +++++------ www/manager6/ceph/StatusDetail.js | 52 ++--- www/manager6/controller/StorageEdit.js | 6 +- www/manager6/data/ResourceStore.js | 64 +++---- www/manager6/data/model/RRDModels.js | 18 +- www/manager6/dc/ACLView.js | 88 ++++----- www/manager6/dc/Backup.js | 150 +++++++-------- www/manager6/dc/Cluster.js | 114 +++++------ www/manager6/dc/ClusterEdit.js | 76 ++++---- www/manager6/dc/Config.js | 60 +++--- www/manager6/dc/CorosyncLinkEdit.js | 52 ++--- www/manager6/dc/GroupEdit.js | 10 +- www/manager6/dc/GroupView.js | 32 ++-- www/manager6/dc/Guests.js | 34 ++-- www/manager6/dc/Health.js | 32 ++-- www/manager6/dc/Log.js | 28 +-- www/manager6/dc/NodeView.js | 38 ++-- www/manager6/dc/OptionView.js | 42 ++--- www/manager6/dc/PoolView.js | 30 +-- www/manager6/dc/RoleEdit.js | 14 +- www/manager6/dc/RoleView.js | 28 +-- www/manager6/dc/SecurityGroups.js | 48 ++--- www/manager6/dc/StorageView.js | 50 ++--- www/manager6/dc/Summary.js | 50 ++--- www/manager6/dc/Support.js | 8 +- www/manager6/dc/SyncWindow.js | 2 +- www/manager6/dc/TFAEdit.js | 122 ++++++------ www/manager6/dc/Tasks.js | 32 ++-- www/manager6/dc/UserEdit.js | 44 ++--- www/manager6/dc/UserView.js | 56 +++--- www/manager6/form/ACMEAccountSelector.js | 2 +- www/manager6/form/AgentFeatureSelector.js | 6 +- www/manager6/form/BackupModeSelector.js | 4 +- www/manager6/form/BandwidthSelector.js | 4 +- www/manager6/form/Boolean.js | 4 +- www/manager6/form/BridgeSelector.js | 20 +- www/manager6/form/BusTypeSelector.js | 2 +- www/manager6/form/CPUModelSelector.js | 24 +-- www/manager6/form/CacheTypeSelector.js | 4 +- www/manager6/form/CalendarEvent.js | 10 +- www/manager6/form/CephPoolSelector.js | 10 +- www/manager6/form/CompressionSelector.js | 2 +- www/manager6/form/ContentTypeSelector.js | 2 +- www/manager6/form/ControllerSelector.js | 14 +- www/manager6/form/DayOfWeekSelector.js | 4 +- www/manager6/form/DiskFormatSelector.js | 4 +- www/manager6/form/DiskStorageSelector.js | 18 +- .../form/EmailNotificationSelector.js | 4 +- www/manager6/form/FileSelector.js | 18 +- www/manager6/form/FirewallPolicySelector.js | 4 +- www/manager6/form/GlobalSearchField.js | 44 ++--- www/manager6/form/GroupSelector.js | 22 +-- www/manager6/form/GuestIDSelector.js | 10 +- www/manager6/form/HotplugFeatureSelector.js | 16 +- www/manager6/form/IPProtocolSelector.js | 16 +- www/manager6/form/IPRefSelector.js | 18 +- www/manager6/form/MDevSelector.js | 22 +-- www/manager6/form/MemoryField.js | 2 +- www/manager6/form/NetworkCardSelector.js | 4 +- www/manager6/form/NodeSelector.js | 24 +-- www/manager6/form/PCISelector.js | 26 +-- www/manager6/form/PermPathSelector.js | 4 +- www/manager6/form/PoolSelector.js | 18 +- www/manager6/form/PrivilegesSelector.js | 6 +- www/manager6/form/QemuBiosSelector.js | 4 +- www/manager6/form/SDNControllerSelector.js | 14 +- www/manager6/form/SDNZoneSelector.js | 14 +- www/manager6/form/ScsiHwSelector.js | 4 +- www/manager6/form/SecurityGroupSelector.js | 18 +- www/manager6/form/SnapshotSelector.js | 14 +- www/manager6/form/SpiceEnhancementSelector.js | 4 +- www/manager6/form/StorageSelector.js | 26 +-- www/manager6/form/TokenSelector.js | 12 +- www/manager6/form/USBSelector.js | 48 ++--- www/manager6/form/UserSelector.js | 26 +-- www/manager6/form/VLanField.js | 4 +- www/manager6/form/VMCPUFlagSelector.js | 32 ++-- www/manager6/form/VMSelector.js | 102 +++++----- www/manager6/form/VNCKeyboardSelector.js | 2 +- www/manager6/form/ViewSelector.js | 18 +- www/manager6/form/iScsiProviderSelector.js | 4 +- www/manager6/grid/BackupView.js | 48 ++--- www/manager6/grid/FirewallAliases.js | 42 ++--- www/manager6/grid/FirewallOptions.js | 44 ++--- www/manager6/grid/FirewallRules.js | 178 +++++++++--------- www/manager6/grid/PoolMembers.js | 74 ++++---- www/manager6/grid/Replication.js | 116 ++++++------ www/manager6/grid/ResourceGrid.js | 18 +- www/manager6/ha/Fencing.js | 18 +- www/manager6/ha/GroupEdit.js | 56 +++--- www/manager6/ha/GroupSelector.js | 26 +-- www/manager6/ha/Groups.js | 38 ++-- www/manager6/ha/ResourceEdit.js | 46 ++--- www/manager6/ha/Resources.js | 48 ++--- www/manager6/ha/Status.js | 14 +- www/manager6/ha/StatusView.js | 22 +-- www/manager6/lxc/CmdMenu.js | 28 +-- www/manager6/lxc/Config.js | 88 ++++----- www/manager6/lxc/CreateWizard.js | 90 ++++----- www/manager6/lxc/DNS.js | 42 ++--- www/manager6/lxc/FeaturesEdit.js | 24 +-- www/manager6/lxc/MPEdit.js | 72 +++---- www/manager6/lxc/MPResize.js | 18 +- www/manager6/lxc/Network.js | 118 ++++++------ www/manager6/lxc/Options.js | 58 +++--- www/manager6/lxc/ResourceEdit.js | 30 +-- www/manager6/lxc/Resources.js | 54 +++--- www/manager6/menu/MenuItem.js | 4 +- www/manager6/menu/TemplateMenu.js | 14 +- www/manager6/node/ACME.js | 50 ++--- www/manager6/node/Certificates.js | 110 +++++------ www/manager6/node/CmdMenu.js | 32 ++-- www/manager6/node/Directory.js | 46 ++--- www/manager6/node/LVM.js | 48 ++--- www/manager6/node/LVMThin.js | 56 +++--- www/manager6/node/StatusView.js | 36 ++-- www/manager6/node/Summary.js | 36 ++-- www/manager6/node/ZFS.js | 132 ++++++------- www/manager6/panel/ConfigPanel.js | 26 +-- www/manager6/panel/GuestStatusView.js | 40 ++-- www/manager6/panel/GuestSummary.js | 34 ++-- www/manager6/panel/HealthWidget.js | 8 +- www/manager6/panel/IPSet.js | 102 +++++----- www/manager6/panel/InfoWidget.js | 18 +- www/manager6/panel/NotesView.js | 14 +- www/manager6/panel/RunningChart.js | 40 ++-- www/manager6/panel/StatusPanel.js | 12 +- www/manager6/panel/StatusView.js | 10 +- www/manager6/panel/TemplateStatusView.js | 28 +-- www/manager6/pool/Config.js | 12 +- www/manager6/pool/StatusView.js | 8 +- www/manager6/pool/Summary.js | 8 +- www/manager6/qemu/AgentIPView.js | 40 ++-- www/manager6/qemu/AudioEdit.js | 18 +- www/manager6/qemu/CDEdit.js | 26 +-- www/manager6/qemu/CIDriveEdit.js | 14 +- www/manager6/qemu/CloudInit.js | 48 ++--- www/manager6/qemu/CmdMenu.js | 38 ++-- www/manager6/qemu/Config.js | 102 +++++----- www/manager6/qemu/CreateWizard.js | 90 ++++----- www/manager6/qemu/DisplayEdit.js | 20 +- www/manager6/qemu/HDEdit.js | 62 +++--- www/manager6/qemu/HDEfi.js | 6 +- www/manager6/qemu/HDMove.js | 22 +-- www/manager6/qemu/HDResize.js | 18 +- www/manager6/qemu/HardwareView.js | 132 ++++++------- www/manager6/qemu/IPConfigEdit.js | 54 +++--- www/manager6/qemu/KeyboardEdit.js | 6 +- www/manager6/qemu/MemoryEdit.js | 30 +-- www/manager6/qemu/Monitor.js | 16 +- www/manager6/qemu/NetworkEdit.js | 40 ++-- www/manager6/qemu/OSDefaults.js | 14 +- www/manager6/qemu/OSTypeEdit.js | 26 +-- www/manager6/qemu/Options.js | 102 +++++----- www/manager6/qemu/PCIEdit.js | 46 ++--- www/manager6/qemu/ProcessorEdit.js | 26 +-- www/manager6/qemu/RNGEdit.js | 28 +-- www/manager6/qemu/SSHKey.js | 16 +- www/manager6/qemu/ScsiHwEdit.js | 6 +- www/manager6/qemu/SerialEdit.js | 12 +- www/manager6/qemu/Smbios1Edit.js | 38 ++-- www/manager6/qemu/SystemEdit.js | 50 ++--- www/manager6/qemu/USBEdit.js | 30 +-- www/manager6/sdn/Browser.js | 8 +- www/manager6/sdn/ControllerView.js | 30 +-- www/manager6/sdn/Status.js | 10 +- www/manager6/sdn/StatusView.js | 26 +-- www/manager6/sdn/VnetEdit.js | 2 +- www/manager6/sdn/VnetView.js | 26 +-- www/manager6/sdn/ZoneContentView.js | 28 +-- www/manager6/sdn/ZoneView.js | 30 +-- www/manager6/sdn/controllers/Base.js | 8 +- www/manager6/sdn/controllers/EvpnEdit.js | 12 +- www/manager6/sdn/zones/Base.js | 10 +- www/manager6/sdn/zones/EvpnEdit.js | 12 +- www/manager6/sdn/zones/QinQEdit.js | 10 +- www/manager6/sdn/zones/SimpleEdit.js | 8 +- www/manager6/sdn/zones/VlanEdit.js | 8 +- www/manager6/sdn/zones/VxlanEdit.js | 8 +- www/manager6/storage/BackupView.js | 12 +- www/manager6/storage/Base.js | 18 +- www/manager6/storage/Browser.js | 12 +- www/manager6/storage/CephFSEdit.js | 24 +-- www/manager6/storage/DirEdit.js | 10 +- www/manager6/storage/GlusterFsEdit.js | 24 +-- www/manager6/storage/IScsiEdit.js | 24 +-- www/manager6/storage/ImageView.js | 6 +- www/manager6/storage/LVMEdit.js | 42 ++--- www/manager6/storage/LvmThinEdit.js | 34 ++-- www/manager6/storage/NFSEdit.js | 28 +-- www/manager6/storage/RBDEdit.js | 58 +++--- www/manager6/storage/StatusView.js | 22 +-- www/manager6/storage/Summary.js | 26 +-- www/manager6/storage/TemplateView.js | 58 +++--- www/manager6/storage/ZFSEdit.js | 36 ++-- www/manager6/storage/ZFSPoolEdit.js | 24 +-- www/manager6/tree/ResourceTree.js | 36 ++-- www/manager6/tree/SnapshotTree.js | 24 +-- www/manager6/window/Backup.js | 30 +-- www/manager6/window/BackupConfig.js | 12 +- www/manager6/window/BulkAction.js | 34 ++-- www/manager6/window/CephInstall.js | 28 +-- www/manager6/window/Clone.js | 56 +++--- www/manager6/window/FirewallEnableEdit.js | 14 +- www/manager6/window/FirewallLograteEdit.js | 22 +-- www/manager6/window/LoginWindow.js | 58 +++--- www/manager6/window/Migrate.js | 96 +++++----- www/manager6/window/Restore.js | 34 ++-- www/manager6/window/SafeDestroy.js | 42 ++--- www/manager6/window/Settings.js | 94 ++++----- www/manager6/window/Snapshot.js | 26 +-- www/manager6/window/StartupEdit.js | 18 +- www/manager6/window/Wizard.js | 28 +-- 231 files changed, 3847 insertions(+), 3847 deletions(-) diff --git a/www/manager6/Parser.js b/www/manager6/Parser.js index b793a28e..943c635c 100644 --- a/www/manager6/Parser.js +++ b/www/manager6/Parser.js @@ -366,7 +366,7 @@ Ext.define('PVE.Parser', { statics: { Ext.Object.each(netif, function(iface, data) { var tmparray = []; - Ext.Array.each(['ifname', 'mac', 'bridge', 'host_ifname' , 'host_mac', 'mac_filter', 'tag', 'firewall'], function(key) { + Ext.Array.each(['ifname', 'mac', 'bridge', 'host_ifname', 'host_mac', 'mac_filter', 'tag', 'firewall'], function(key) { var value = data[key]; if (key === 'bridge'){ if(data.tag){ @@ -686,7 +686,7 @@ Ext.define('PVE.Parser', { statics: { return { type: m[1], key: m[2], - comment: m[3] + comment: m[3], }; } if (m[2].match(typere)) { @@ -694,7 +694,7 @@ Ext.define('PVE.Parser', { statics: { options: m[1], type: m[2], key: m[3], - comment: m[4] + comment: m[4], }; } return null; diff --git a/www/manager6/StateProvider.js b/www/manager6/StateProvider.js index a7fa46ae..aa5be2e8 100644 --- a/www/manager6/StateProvider.js +++ b/www/manager6/StateProvider.js @@ -44,7 +44,7 @@ Ext.define('PVE.StateProvider', { ['pooltab', ''], ['kvmtab', ''], ['lxctab', ''], - ['dctab', ''] + ['dctab', ''], ], hprefix: 'v1', @@ -103,7 +103,7 @@ Ext.define('PVE.StateProvider', { clog: 3, storage: 2, folder: 1, - server: 0 + server: 0, }, decodeHToken: function(token) { @@ -253,5 +253,5 @@ Ext.define('PVE.StateProvider', { } else { me.callParent(arguments); } - } + }, }); diff --git a/www/manager6/Toolkit.js b/www/manager6/Toolkit.js index 0569d649..f4db2e0b 100644 --- a/www/manager6/Toolkit.js +++ b/www/manager6/Toolkit.js @@ -12,7 +12,7 @@ Ext.apply(Ext.form.field.VTypes, { IP64AddressList: v => PVE.Utils.verify_ip64_address_list(v, false), IP64AddressWithSuffixList: v => PVE.Utils.verify_ip64_address_list(v, true), IP64AddressListText: gettext('Example') + ': 192.168.1.1,192.168.1.2', - IP64AddressListMask: /[A-Fa-f0-9\,\:\.\;\ ]/ + IP64AddressListMask: /[A-Fa-f0-9\,\:\.\;\ ]/, }); Ext.define('PVE.form.field.Display', { @@ -21,5 +21,5 @@ Ext.define('PVE.form.field.Display', { setSubmitValue: function(value) { // do nothing, this is only to allow generalized bindings for the: // `me.isCreate ? 'textfield' : 'displayfield'` cases we have. - } + }, }); diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 2bc505f2..eb21357d 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -10,13 +10,13 @@ Ext.enableAriaPanels = false; // avoid errors when running without development tools if (!Ext.isDefined(Ext.global.console)) { var console = { - log: function() {} + log: function() {}, }; } console.log("Starting PVE Manager"); Ext.Ajax.defaultHeaders = { - 'Accept': 'application/json' + 'Accept': 'application/json', }; Ext.define('PVE.Utils', { utilities: { @@ -35,14 +35,14 @@ Ext.define('PVE.Utils', { utilities: { 4: "warning", 5: "notice", 6: "info", - 7: "debug" + 7: "debug", }, support_level_hash: { 'c': gettext('Community'), 'b': gettext('Basic'), 's': gettext('Standard'), - 'p': gettext('Premium') + 'p': gettext('Premium'), }, noSubKeyHtml: 'You do not have a valid subscription for this server. Please visit www.proxmox.com to get a list of available options.', @@ -50,7 +50,7 @@ Ext.define('PVE.Utils', { utilities: { kvm_ostypes: { 'Linux': [ { desc: '5.x - 2.6 Kernel', val: 'l26' }, - { desc: '2.4 Kernel', val: 'l24' } + { desc: '2.4 Kernel', val: 'l24' }, ], 'Microsoft Windows': [ { desc: '10/2016/2019', val: 'win10' }, @@ -58,14 +58,14 @@ Ext.define('PVE.Utils', { utilities: { { desc: '7/2008r2', val: 'win7' }, { desc: 'Vista/2008', val: 'w2k8' }, { desc: 'XP/2003', val: 'wxp' }, - { desc: '2000', val: 'w2k' } + { desc: '2000', val: 'w2k' }, ], 'Solaris Kernel': [ - { desc: '-', val: 'solaris'} + { desc: '-', val: 'solaris'}, ], 'Other': [ - { desc: '-', val: 'other'} - ] + { desc: '-', val: 'other'}, + ], }, get_health_icon: function(state, circle) { @@ -172,13 +172,13 @@ Ext.define('PVE.Utils', { utilities: { 'HEALTH_UPGRADE':'upgrade', 'HEALTH_OLD':'old', 'HEALTH_WARN':'warning', - 'HEALTH_ERR':'critical' + 'HEALTH_ERR':'critical', }, render_ceph_health: function(healthObj) { var state = { iconCls: PVE.Utils.get_health_icon(), - text: '' + text: '', }; if (!healthObj || !healthObj.status) { @@ -544,7 +544,7 @@ Ext.define('PVE.Utils', { utilities: { sl: 'Slovenian', sv: 'Swedish', //th: 'Thai', - tr: 'Turkish' + tr: 'Turkish', }, kvm_vga_drivers: { @@ -559,7 +559,7 @@ Ext.define('PVE.Utils', { utilities: { serial2: gettext('Serial terminal') + ' 2', serial3: gettext('Serial terminal') + ' 3', virtio: 'VirtIO-GPU', - none: Proxmox.Utils.noneText + none: Proxmox.Utils.noneText, }, render_kvm_language: function (value) { @@ -586,7 +586,7 @@ Ext.define('PVE.Utils', { utilities: { '__default__': Proxmox.Utils.defaultText + ' (xterm.js)', 'vv': 'SPICE (remote-viewer)', 'html5': 'HTML5 (noVNC)', - 'xtermjs': 'xterm.js' + 'xtermjs': 'xterm.js', }, render_console_viewer: function(value) { @@ -673,7 +673,7 @@ Ext.define('PVE.Utils', { utilities: { 'vztmpl': gettext('Container template'), 'iso': gettext('ISO image'), 'rootdir': gettext('Container'), - 'snippets': gettext('Snippets') + 'snippets': gettext('Snippets'), }, volume_is_qemu_backup: function(volid, format) { @@ -806,51 +806,51 @@ Ext.define('PVE.Utils', { utilities: { sdnvnetSchema: { vnet: { name: 'vnet', - faIcon: 'folder' + faIcon: 'folder', }, }, sdnzoneSchema: { zone: { name: 'zone', - hideAdd: true + hideAdd: true, }, simple: { name: 'Simple', ipanel: 'SimpleInputPanel', - faIcon: 'th' + faIcon: 'th', }, vlan: { name: 'VLAN', ipanel: 'VlanInputPanel', - faIcon: 'th' + faIcon: 'th', }, qinq: { name: 'QinQ', ipanel: 'QinQInputPanel', - faIcon: 'th' + faIcon: 'th', }, vxlan: { name: 'VXLAN', ipanel: 'VxlanInputPanel', - faIcon: 'th' + faIcon: 'th', }, evpn: { name: 'EVPN', ipanel: 'EvpnInputPanel', - faIcon: 'th' + faIcon: 'th', }, }, sdncontrollerSchema: { controller: { name: 'controller', - hideAdd: true + hideAdd: true, }, evpn: { name: 'evpn', ipanel: 'EvpnInputPanel', - faIcon: 'crosshairs' + faIcon: 'crosshairs', }, }, @@ -917,10 +917,10 @@ Ext.define('PVE.Utils', { utilities: { Ext.isNumber(data.id) && Ext.isNumber(data.lun)) { return "CH " + - Ext.String.leftPad(data.channel,2, '0') + + Ext.String.leftPad(data.channel, 2, '0') + " ID " + data.id + " LUN " + data.lun; } - return data.volid.replace(/^.*?:(.*?\/)?/,''); + return data.volid.replace(/^.*?:(.*?\/)?/, ''); }, render_serverity: function (value) { @@ -1077,7 +1077,7 @@ Ext.define('PVE.Utils', { utilities: { render_resource_type: function(value, metaData, record, rowIndex, colIndex, store) { - var cls = PVE.Utils.get_object_icon_class(value,record.data); + var cls = PVE.Utils.get_object_icon_class(value, record.data); var fa = ' '; return fa + value; @@ -1157,7 +1157,7 @@ Ext.define('PVE.Utils', { utilities: { '2': gettext('Bad Request'), '3': gettext('Configuration Unsupported'), '4': gettext('Device Ineligible'), - '5': gettext('Timeout') + '5': gettext('Timeout'), }; return "U2F Error: " + ErrorNames[error] || Proxmox.Utils.unknownText; }, @@ -1240,7 +1240,7 @@ Ext.define('PVE.Utils', { utilities: { vmname: vmname, node: nodename, resize: scaling, - cmd: cmd + cmd: cmd, }); var nw = window.open("?" + url, '_blank', "innerWidth=745,innerheight=427"); if (nw) { @@ -1254,7 +1254,7 @@ Ext.define('PVE.Utils', { utilities: { var link = Ext.DomHelper.append(document.body, { tag: 'a', href: uri, - css : 'display:none;visibility:hidden;height:0px;' + css : 'display:none;visibility:hidden;height:0px;', }); // Note: we need to tell android the correct file name extension @@ -1290,7 +1290,7 @@ Ext.define('PVE.Utils', { utilities: { encodeURIComponent(raw); downloadWithName(url, "pve-spice.vv"); - } + }, }); }, @@ -1312,7 +1312,7 @@ Ext.define('PVE.Utils', { utilities: { xtermjs: !!conf.serial, }; PVE.Utils.openDefaultConsoleWindow(consoles, 'kvm', vmid, nodename, vmname); - } + }, }); } else if (record.data.type === 'lxc' && !record.data.template) { PVE.Utils.openDefaultConsoleWindow(true, 'lxc', vmid, nodename, vmname); @@ -1348,7 +1348,7 @@ Ext.define('PVE.Utils', { utilities: { if (template) { if (type === 'qemu' || type == 'lxc') { menu = Ext.create('PVE.menu.TemplateMenu', { - pveSelNode: record + pveSelNode: record, }); } } else if (type === 'qemu' || @@ -1356,7 +1356,7 @@ Ext.define('PVE.Utils', { utilities: { type === 'node') { menu = Ext.create('PVE.' + type + '.CmdMenu', { pveSelNode: record, - nodename: record.data.node + nodename: record.data.node, }); } else { return; @@ -1545,7 +1545,7 @@ Ext.define('PVE.Utils', { utilities: { if (!container.down('pveCephInstallWindow')){ var isInstalled = msg.match(/not initialized/i) ? true : false; var win = Ext.create('PVE.ceph.Install', { - nodename: nodename + nodename: nodename, }); win.getViewModel().set('isInstalled', isInstalled); container.add(win); @@ -1617,7 +1617,7 @@ Ext.define('PVE.Utils', { utilities: { cpu_vendor_map: { 'default': 'QEMU', 'AuthenticAMD': 'AMD', - 'GenuineIntel': 'Intel' + 'GenuineIntel': 'Intel', }, cpu_vendor_order: { @@ -1745,6 +1745,6 @@ Ext.define('PVE.Utils', { utilities: { vzumount: ['CT', gettext('Unmount')], zfscreate: [gettext('ZFS Storage'), gettext('Create')], }); - } + }, }); diff --git a/www/manager6/VNCConsole.js b/www/manager6/VNCConsole.js index 204babcc..b8dd376b 100644 --- a/www/manager6/VNCConsole.js +++ b/www/manager6/VNCConsole.js @@ -52,8 +52,8 @@ Ext.define('PVE.noVncConsole', { PVE.Utils.cleanEmptyObjectKeys(queryDict); var url = '/?' + Ext.Object.toQueryString(queryDict); box.load(url); - } - } + }, + }, }); me.callParent(); @@ -67,6 +67,6 @@ Ext.define('PVE.noVncConsole', { // reload IFrame content to forcibly reconnect VNC/xterm.js to VM var box = this.down('[itemid=vncconsole]'); box.getWin().location.reload(); - } + }, }); diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js index 3d0f3fec..f77b5024 100644 --- a/www/manager6/Workspace.js +++ b/www/manager6/Workspace.js @@ -48,7 +48,7 @@ Ext.define('PVE.Workspace', { me.login = null; me.updateLoginData(data); Proxmox.Utils.checked_command(function() {}); // display subscription status - } + }, }); } me.onLogin(null); @@ -92,20 +92,20 @@ Ext.define('PVE.Workspace', { Ext.Ajax.request({ params: { username: Proxmox.UserName, - password: ticket + password: ticket, }, url: '/api2/json/access/ticket', method: 'POST', success: function(response, opts) { var obj = Ext.decode(response.responseText); me.updateLoginData(obj.data); - } + }, }); }, - interval: 15*60*1000 + interval: 15*60*1000, }); - } + }, }); Ext.define('PVE.StdWorkspace', { @@ -161,7 +161,7 @@ Ext.define('PVE.StdWorkspace', { success: function(response) { PVE.VersionInfo = response.result.data; me.updateVersionInfo(); - } + }, }); Proxmox.Utils.API2Request({ @@ -228,7 +228,7 @@ Ext.define('PVE.StdWorkspace', { lxc: 'PVE.lxc.Config', storage: 'PVE.storage.Browser', sdn: 'PVE.sdn.Browser', - pool: 'pvePoolConfig' + pool: 'pvePoolConfig', }; var comp = { xtype: tlckup[n.data.type || 'root'] || @@ -237,14 +237,14 @@ Ext.define('PVE.StdWorkspace', { Ext.isDefined(n.data.groupbyid), pveSelNode: n, workspace: me, - viewFilter: selview.getViewFilter() + viewFilter: selview.getViewFilter(), }; PVE.curSelectedNode = n; me.setContent(comp); } - } - } - } + }, + }, + }, }); selview.on('select', function(combo, records) { @@ -266,7 +266,7 @@ Ext.define('PVE.StdWorkspace', { handler: function() { var wiz = Ext.create('PVE.qemu.CreateWizard', {}); wiz.show(); - } + }, }); var createCT = Ext.createWidget('button', { @@ -279,7 +279,7 @@ Ext.define('PVE.StdWorkspace', { handler: function() { var wiz = Ext.create('PVE.lxc.CreateWizard', {}); wiz.show(); - } + }, }); sprovider.on('statechange', function(sp, key, value) { @@ -298,11 +298,11 @@ Ext.define('PVE.StdWorkspace', { region: 'north', layout: { type: 'hbox', - align: 'middle' + align: 'middle', }, baseCls: 'x-plain', defaults: { - baseCls: 'x-plain' + baseCls: 'x-plain', }, border: false, margin: '2 0 2 5', @@ -313,14 +313,14 @@ Ext.define('PVE.StdWorkspace', { { minWidth: 150, id: 'versioninfo', - html: 'Virtual Environment' + html: 'Virtual Environment', }, { xtype: 'pveGlobalSearchField', - tree: rtree + tree: rtree, }, { - flex: 1 + flex: 1, }, { xtype: 'proxmoxHelpButton', @@ -330,7 +330,7 @@ Ext.define('PVE.StdWorkspace', { listenToGlobalEvent: false, onlineHelp: 'pve_documentation_index', text: gettext('Documentation'), - margin: '0 5 0 0' + margin: '0 5 0 0', }, createVM, createCT, @@ -343,7 +343,7 @@ Ext.define('PVE.StdWorkspace', { style: { // proxmox dark grey p light grey as border backgroundColor: '#464d4d', - borderColor: '#ABBABA' + borderColor: '#ABBABA', }, iconCls: 'fa fa-user', menu: [ @@ -353,27 +353,27 @@ Ext.define('PVE.StdWorkspace', { handler: function() { var win = Ext.create('PVE.window.Settings'); win.show(); - } + }, }, { text: gettext('Password'), iconCls: 'fa fa-fw fa-key', handler: function() { var win = Ext.create('Proxmox.window.PasswordEdit', { - userid: Proxmox.UserName + userid: Proxmox.UserName, }); win.show(); - } + }, }, { text: 'TFA', iconCls: 'fa fa-fw fa-lock', handler: function(btn, event, rec) { - var win = Ext.create('PVE.window.TFAEdit',{ - userid: Proxmox.UserName + var win = Ext.create('PVE.window.TFAEdit', { + userid: Proxmox.UserName, }); win.show(); - } + }, }, { iconCls: 'fa fa-language', @@ -402,11 +402,11 @@ Ext.define('PVE.StdWorkspace', { comp.getStore().loadData([], false); } }); - } - } - ] - } - ] + }, + }, + ], + }, + ], }, { region: 'center', @@ -419,7 +419,7 @@ Ext.define('PVE.StdWorkspace', { layout: { type: 'card' }, border: false, margin: '0 5 0 0', - items: [] + items: [], }, { region: 'west', @@ -439,8 +439,8 @@ Ext.define('PVE.StdWorkspace', { if (width > viewWidth - 100) { panel.setWidth(viewWidth - 100); } - } - } + }, + }, }, { xtype: 'pveStatusPanel', @@ -460,10 +460,10 @@ Ext.define('PVE.StdWorkspace', { if (height > (viewHeight - 150)) { panel.setHeight(viewHeight - 150); } - } - } - } - ] + }, + }, + }, + ], }); me.callParent(); @@ -479,6 +479,6 @@ Ext.define('PVE.StdWorkspace', { }); } }); - } + }, }); diff --git a/www/manager6/button/ConsoleButton.js b/www/manager6/button/ConsoleButton.js index 0451bf59..8dab088c 100644 --- a/www/manager6/button/ConsoleButton.js +++ b/www/manager6/button/ConsoleButton.js @@ -37,7 +37,7 @@ Ext.define('PVE.button.ConsoleButton', { var me = this; var consoles = { spice: me.enableSpice, - xtermjs: me.enableXtermjs + xtermjs: me.enableXtermjs, }; PVE.Utils.openDefaultConsoleWindow(consoles, me.consoleType, me.vmid, me.nodename, me.consoleName, me.cmd); @@ -52,7 +52,7 @@ Ext.define('PVE.button.ConsoleButton', { handler: function(button) { var me = this.up('button'); PVE.Utils.openConsoleWindow(button.type, me.consoleType, me.vmid, me.nodename, me.consoleName, me.cmd); - } + }, }, { xterm: 'menuitem', @@ -63,7 +63,7 @@ Ext.define('PVE.button.ConsoleButton', { handler: function(button) { var me = this.up('button'); PVE.Utils.openConsoleWindow(button.type, me.consoleType, me.vmid, me.nodename, me.consoleName, me.cmd); - } + }, }, { text: 'xterm.js', @@ -73,8 +73,8 @@ Ext.define('PVE.button.ConsoleButton', { handler: function(button) { var me = this.up('button'); PVE.Utils.openConsoleWindow(button.type, me.consoleType, me.vmid, me.nodename, me.consoleName, me.cmd); - } - } + }, + }, ], initComponent: function() { @@ -85,5 +85,5 @@ Ext.define('PVE.button.ConsoleButton', { } me.callParent(); - } + }, }); diff --git a/www/manager6/button/Revert.js b/www/manager6/button/Revert.js index 88293641..f1d69ce1 100644 --- a/www/manager6/button/Revert.js +++ b/www/manager6/button/Revert.js @@ -28,7 +28,7 @@ Ext.define('PVE.button.PendingRevert', { selModel: view.getSelectionModel(), method: 'PUT', params: { - 'revert': keys.join(',') + 'revert': keys.join(','), }, callback: () => view.reload(), failure: (response) => Ext.Msg.alert('Error', response.htmlStatus), diff --git a/www/manager6/button/Split.js b/www/manager6/button/Split.js index 317fa5d7..e7d45fcf 100644 --- a/www/manager6/button/Split.js +++ b/www/manager6/button/Split.js @@ -47,7 +47,7 @@ Ext.define('PVE.button.Split', { return; } me.realHandler(button, event, rec); - } + }, }); } else { me.realHandler(button, event, rec); @@ -96,5 +96,5 @@ Ext.define('PVE.button.Split', { } }); } - } + }, }); diff --git a/www/manager6/ceph/CephInstallWizard.js b/www/manager6/ceph/CephInstallWizard.js index bc4528e9..6c60d221 100644 --- a/www/manager6/ceph/CephInstallWizard.js +++ b/www/manager6/ceph/CephInstallWizard.js @@ -126,7 +126,7 @@ Ext.define('PVE.ceph.CephHighestVersionDisplay', { }, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); }, }); @@ -145,10 +145,10 @@ Ext.define('PVE.ceph.CephInstallWizard', { cephRelease: 'octopus', configuration: true, isInstalled: false, - } + }, }, cbindData: { - nodename: undefined + nodename: undefined, }, title: gettext('Setup'), @@ -204,7 +204,7 @@ Ext.define('PVE.ceph.CephInstallWizard', { xtype: 'pveCephHighestVersionDisplay', labelWidth: 180, cbind:{ - nodename: '{nodename}' + nodename: '{nodename}', }, gotNewestVersion: function(release, maxversiontext, maxversion) { if (release === 'unknown') { @@ -249,22 +249,22 @@ Ext.define('PVE.ceph.CephInstallWizard', { Ext.GlobalEvents.fireEvent('proxmoxHideHelp', this.onlineHelp); } this.up('pveCephInstallWizard').down('#next').setText(gettext('Next')); - } - } + }, + }, }, { title: gettext('Installation'), xtype: 'panel', layout: 'fit', cbind:{ - nodename: '{nodename}' + nodename: '{nodename}', }, viewModel: {}, // needed to inherit parent viewModel data listeners: { afterrender: function() { var me = this; if (this.getViewModel().get('isInstalled')) { - this.mask("Ceph is already installed, click next to create your configuration.",['pve-static-mask']); + this.mask("Ceph is already installed, click next to create your configuration.", ['pve-static-mask']); } else { me.down('pveNoVncConsole').fireEvent('activate'); } @@ -277,7 +277,7 @@ Ext.define('PVE.ceph.CephInstallWizard', { interval: 1000, proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + nodename + '/ceph/status' + url: '/api2/json/nodes/' + nodename + '/ceph/status', }, listeners: { load: function(rec, response, success, operation) { @@ -287,17 +287,17 @@ Ext.define('PVE.ceph.CephInstallWizard', { me.down('textfield').setValue('success'); } else if (operation.error.statusText.match("not initialized", "i")) { me.updateStore.stopUpdate(); - me.up('pveCephInstallWizard').getViewModel().set('configuration',false); + me.up('pveCephInstallWizard').getViewModel().set('configuration', false); me.down('textfield').setValue('success'); } else if (operation.error.statusText.match("rados_connect failed", "i")) { me.updateStore.stopUpdate(); - me.up('pveCephInstallWizard').getViewModel().set('configuration',true); + me.up('pveCephInstallWizard').getViewModel().set('configuration', true); me.down('textfield').setValue('success'); } else if (!operation.error.statusText.match("not installed", "i")) { Proxmox.Utils.setErrorMask(me, operation.error.statusText); } - } - } + }, + }, }); me.updateStore.startUpdate(); }, @@ -306,7 +306,7 @@ Ext.define('PVE.ceph.CephInstallWizard', { if (me.updateStore) { me.updateStore.stopUpdate(); } - } + }, }, items: [ { @@ -331,22 +331,22 @@ Ext.define('PVE.ceph.CephInstallWizard', { value: '', allowBlank: false, submitValue: false, - hidden: true - } - ] + hidden: true, + }, + ], }, { xtype: 'inputpanel', title: gettext('Configuration'), onlineHelp: 'chapter_pveceph', cbind: { - nodename: '{nodename}' + nodename: '{nodename}', }, viewModel: { data: { replicas: undefined, - minreplicas: undefined - } + minreplicas: undefined, + }, }, listeners: { activate: function() { @@ -354,19 +354,19 @@ Ext.define('PVE.ceph.CephInstallWizard', { }, beforeshow: function() { if (this.up('pveCephInstallWizard').getViewModel().get('configuration')) { - this.mask("Configuration already initialized",['pve-static-mask']); + this.mask("Configuration already initialized", ['pve-static-mask']); } else { this.unmask(); } }, deactivate: function() { this.up('pveCephInstallWizard').down('#submit').setText(gettext('Finish')); - } + }, }, column1: [ { xtype: 'displayfield', - value: gettext('Ceph cluster configuration') + ':' + value: gettext('Ceph cluster configuration') + ':', }, { xtype: 'proxmoxNetworkSelector', @@ -374,11 +374,11 @@ Ext.define('PVE.ceph.CephInstallWizard', { value: '', fieldLabel: 'Public Network IP/CIDR', bind: { - allowBlank: '{configuration}' + allowBlank: '{configuration}', }, cbind: { - nodename: '{nodename}' - } + nodename: '{nodename}', + }, }, { xtype: 'proxmoxNetworkSelector', @@ -388,28 +388,28 @@ Ext.define('PVE.ceph.CephInstallWizard', { autoSelect: false, emptyText: gettext('Same as Public Network'), cbind: { - nodename: '{nodename}' - } - } + nodename: '{nodename}', + }, + }, // FIXME: add hint about cluster network and/or reference user to docs?? ], column2: [ { xtype: 'displayfield', - value: gettext('First Ceph monitor') + ':' + value: gettext('First Ceph monitor') + ':', }, { xtype: 'pveNodeSelector', fieldLabel: gettext('Monitor node'), name: 'mon-node', selectCurNode: true, - allowBlank: false + allowBlank: false, }, { xtype: 'displayfield', value: gettext('Additional monitors are recommended. They can be created at any time in the Monitor tab.'), - userCls: 'pmx-hint' - } + userCls: 'pmx-hint', + }, ], advancedColumn1: [ { @@ -417,11 +417,11 @@ Ext.define('PVE.ceph.CephInstallWizard', { name: 'size', fieldLabel: 'Number of replicas', bind: { - value: '{replicas}' + value: '{replicas}', }, maxValue: 7, minValue: 2, - emptyText: '3' + emptyText: '3', }, { xtype: 'numberfield', @@ -429,7 +429,7 @@ Ext.define('PVE.ceph.CephInstallWizard', { fieldLabel: 'Minimum replicas', bind: { maxValue: '{replicas}', - value: '{minreplicas}' + value: '{minreplicas}', }, minValue: 2, maxValue: 3, @@ -442,8 +442,8 @@ Ext.define('PVE.ceph.CephInstallWizard', { this.toggleSpinners(); this.validate(); }, - emptyText: '2' - } + emptyText: '2', + }, ], onGetValues: function(values) { ['cluster-network', 'size', 'min_size'].forEach(function(field) { @@ -478,18 +478,18 @@ Ext.define('PVE.ceph.CephInstallWizard', { }, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); }, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); } else { me.up('pveCephInstallWizard').navigateNext(); } - } + }, }, { title: gettext('Success'), @@ -524,12 +524,12 @@ Ext.define('PVE.ceph.CephInstallWizard', { if (this.onlineHelp) { Ext.GlobalEvents.fireEvent('proxmoxHideHelp', this.onlineHelp); } - } + }, }, onSubmit: function() { var wizard = this.up('pveCephInstallWizard'); wizard.close(); - } - } - ] + }, + }, + ], }); diff --git a/www/manager6/ceph/Config.js b/www/manager6/ceph/Config.js index 790f04c2..fa665bf1 100644 --- a/www/manager6/ceph/Config.js +++ b/www/manager6/ceph/Config.js @@ -5,8 +5,8 @@ Ext.define('PVE.node.CephConfigDb', { border: false, store: { proxy: { - type: 'proxmox' - } + type: 'proxmox', + }, }, columns: [ @@ -41,7 +41,7 @@ Ext.define('PVE.node.CephConfigDb', { text: 'Runtime Updatable', hidden: true, width: 80, - renderer: Proxmox.Utils.format_boolean + renderer: Proxmox.Utils.format_boolean, }, ], @@ -59,7 +59,7 @@ Ext.define('PVE.node.CephConfigDb', { Proxmox.Utils.monStoreErrors(me, me.getStore()); me.getStore().load(); - } + }, }); Ext.define('PVE.node.CephConfig', { extend: 'Ext.panel.Panel', @@ -83,14 +83,14 @@ Ext.define('PVE.node.CephConfig', { me.mon(win, 'cephInstallWindowClosed', function(){ me.load(); }); - } + }, ); }, success: function(response, opts) { var data = response.result.data; me.update(Ext.htmlEncode(data)); - } + }, }); }, @@ -107,14 +107,14 @@ Ext.define('PVE.node.CephConfig', { listeners: { activate: function() { me.load(); - } - } + }, + }, }); me.callParent(); me.load(); - } + }, }); Ext.define('PVE.node.CephConfigCrush', { @@ -127,14 +127,14 @@ Ext.define('PVE.node.CephConfigCrush', { items: [{ title: gettext('Configuration'), xtype: 'pveNodeCephConfig', - region: 'center' + region: 'center', }, { title: 'Crush Map', // do not localize xtype: 'pveNodeCephCrushMap', region: 'east', split: true, - width: '50%' + width: '50%', }, { title: gettext('Configuration Database'), @@ -142,14 +142,14 @@ Ext.define('PVE.node.CephConfigCrush', { region: 'south', split: true, weight: -30, - height: '50%' + height: '50%', }], initComponent: function() { var me = this; me.defaults = { - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }; me.callParent(); - } + }, }); diff --git a/www/manager6/ceph/Crush.js b/www/manager6/ceph/Crush.js index e9a7fb4a..2a35cc8c 100644 --- a/www/manager6/ceph/Crush.js +++ b/www/manager6/ceph/Crush.js @@ -21,13 +21,13 @@ Ext.define('PVE.node.CephCrushMap', { me.mon(win, 'cephInstallWindowClosed', function(){ me.load(); }); - } + }, ); }, success: function(response, opts) { var data = response.result.data; me.update(Ext.htmlEncode(data)); - } + }, }); }, @@ -45,12 +45,12 @@ Ext.define('PVE.node.CephCrushMap', { listeners: { activate: function() { me.load(); - } - } + }, + }, }); me.callParent(); me.load(); - } + }, }); diff --git a/www/manager6/ceph/FS.js b/www/manager6/ceph/FS.js index 3b8e1caf..76bba3a4 100644 --- a/www/manager6/ceph/FS.js +++ b/www/manager6/ceph/FS.js @@ -28,10 +28,10 @@ Ext.define('PVE.CephCreateFS', { listeners: { change: function(f, value) { this.up('pveCephCreateFS').setFSName(value); - } + }, }, submitValue: false, // already encoded in apicall URL - emptyText: 'cephfs' + emptyText: 'cephfs', }, { xtype: 'proxmoxintegerfield', @@ -41,7 +41,7 @@ Ext.define('PVE.CephCreateFS', { emptyText: 128, minValue: 8, maxValue: 32768, - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxcheckbox', @@ -52,7 +52,7 @@ Ext.define('PVE.CephCreateFS', { tag: 'div', 'data-qtip': gettext('Add the new CephFS to the cluster storage configuration.'), }, - } + }, ], initComponent : function() { @@ -64,7 +64,7 @@ Ext.define('PVE.CephCreateFS', { me.setFSName(); me.callParent(); - } + }, }); Ext.define('PVE.NodeCephFSPanel', { @@ -79,21 +79,21 @@ Ext.define('PVE.NodeCephFSPanel', { defaults: { border: false, cbind: { - nodename: '{nodename}' - } + nodename: '{nodename}', + }, }, viewModel: { parent: null, data: { cephfsConfigured: false, - mdsCount: 0 + mdsCount: 0, }, formulas: { canCreateFS: function(get) { return (!get('cephfsConfigured') && get('mdsCount') > 0); - } - } + }, + }, }, items: [ @@ -112,16 +112,16 @@ Ext.define('PVE.NodeCephFSPanel', { storeid: 'pve-ceph-fs', proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + view.nodename + '/ceph/fs' + url: '/api2/json/nodes/' + view.nodename + '/ceph/fs', }, - model: 'pve-ceph-fs' + model: 'pve-ceph-fs', }); view.setStore(Ext.create('Proxmox.data.DiffStore', { rstore: view.rstore, sorters: { property: 'name', - order: 'DESC' - } + order: 'DESC', + }, })); var regex = new RegExp("not (installed|initialized)", "i"); PVE.Utils.handleStoreErrorOrMask(view, view.rstore, regex, function(me, error){ @@ -131,7 +131,7 @@ Ext.define('PVE.NodeCephFSPanel', { me.mon(win, 'cephInstallWindowClosed', function(){ me.rstore.startUpdate(); }); - } + }, ); }); view.rstore.on('load', this.onLoad, this); @@ -147,8 +147,8 @@ Ext.define('PVE.NodeCephFSPanel', { listeners: { destroy: function() { view.rstore.startUpdate(); - } - } + }, + }, }); }, @@ -159,7 +159,7 @@ Ext.define('PVE.NodeCephFSPanel', { return; } vm.set('cephfsConfigured', true); - } + }, }, tbar: [ { @@ -168,30 +168,30 @@ Ext.define('PVE.NodeCephFSPanel', { handler: 'onCreate', bind: { // only one CephFS per Ceph cluster makes sense for now - disabled: '{!canCreateFS}' - } - } + disabled: '{!canCreateFS}', + }, + }, ], columns: [ { header: gettext('Name'), flex: 1, - dataIndex: 'name' + dataIndex: 'name', }, { header: 'Data Pool', flex: 1, - dataIndex: 'data_pool' + dataIndex: 'data_pool', }, { header: 'Metadata Pool', flex: 1, - dataIndex: 'metadata_pool' - } + dataIndex: 'metadata_pool', + }, ], cbind: { - nodename: '{nodename}' - } + nodename: '{nodename}', + }, }, { xtype: 'pveNodeCephServiceList', @@ -207,18 +207,18 @@ Ext.define('PVE.NodeCephFSPanel', { vm.set('mdsCount', records.length); }, cbind: { - nodename: '{nodename}' - } - } - ] + nodename: '{nodename}', + }, + }, + ], }, function() { Ext.define('pve-ceph-fs', { extend: 'Ext.data.Model', fields: [ 'name', 'data_pool', 'metadata_pool' ], proxy: { type: 'proxmox', - url: "/api2/json/nodes/localhost/ceph/fs" + url: "/api2/json/nodes/localhost/ceph/fs", }, - idProperty: 'name' + idProperty: 'name', }); }); diff --git a/www/manager6/ceph/Log.js b/www/manager6/ceph/Log.js index 36f61a9a..19ab1f6b 100644 --- a/www/manager6/ceph/Log.js +++ b/www/manager6/ceph/Log.js @@ -12,10 +12,10 @@ Ext.define('PVE.ceph.Log', { me.mon(win, 'cephInstallWindowClosed', function(){ me.loadTask.delay(200); }); - } + }, ); if (!windowShow) { Proxmox.Utils.setErrorMask(me, msg); } - } + }, }); diff --git a/www/manager6/ceph/Monitor.js b/www/manager6/ceph/Monitor.js index eb35e91c..eef0defd 100644 --- a/www/manager6/ceph/Monitor.js +++ b/www/manager6/ceph/Monitor.js @@ -9,12 +9,12 @@ Ext.define('PVE.node.CephMonMgrList', { defaults: { border: false, onlineHelp: 'chapter_pveceph', - flex: 1 + flex: 1, }, layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, items: [ @@ -28,19 +28,19 @@ Ext.define('PVE.node.CephMonMgrList', { width: 70, sortable: true, renderer: Proxmox.Utils.format_boolean, - dataIndex: 'quorum' - } + dataIndex: 'quorum', + }, ], stateId: 'grid-ceph-monitor', showCephInstallMask: true, - title: gettext('Monitor') + title: gettext('Monitor'), }, { xtype: 'pveNodeCephServiceList', type: 'mgr', stateId: 'grid-ceph-manager', cbind: { pveSelNode: '{pveSelNode}' }, - title: gettext('Manager') - } - ] + title: gettext('Manager'), + }, + ], }); diff --git a/www/manager6/ceph/Pool.js b/www/manager6/ceph/Pool.js index 271dcc3c..fb2dd873 100644 --- a/www/manager6/ceph/Pool.js +++ b/www/manager6/ceph/Pool.js @@ -13,7 +13,7 @@ Ext.define('PVE.CephCreatePool', { xtype: 'textfield', fieldLabel: gettext('Name'), name: 'name', - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxintegerfield', @@ -22,7 +22,7 @@ Ext.define('PVE.CephCreatePool', { value: 3, minValue: 1, maxValue: 7, - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxintegerfield', @@ -31,13 +31,13 @@ Ext.define('PVE.CephCreatePool', { value: 2, minValue: 1, maxValue: 7, - allowBlank: false + allowBlank: false, }, { xtype: 'pveCephRuleSelector', fieldLabel: 'Crush Rule', // do not localize name: 'crush_rule', - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxKVComboBox', @@ -71,7 +71,7 @@ Ext.define('PVE.CephCreatePool', { tag: 'div', 'data-qtip': gettext('Add the new pool to the cluster storage configuration.'), }, - } + }, ], initComponent : function() { var me = this; @@ -83,12 +83,12 @@ Ext.define('PVE.CephCreatePool', { Ext.apply(me, { url: "/nodes/" + me.nodename + "/ceph/pools", defaults: { - nodename: me.nodename - } + nodename: me.nodename, + }, }); me.callParent(); - } + }, }); Ext.define('PVE.node.CephPoolList', { @@ -108,7 +108,7 @@ Ext.define('PVE.node.CephPoolList', { header: gettext('Name'), width: 120, sortable: true, - dataIndex: 'pool_name' + dataIndex: 'pool_name', }, { header: gettext('Size') + '/min', @@ -117,7 +117,7 @@ Ext.define('PVE.node.CephPoolList', { renderer: function(v, meta, rec) { return v + '/' + rec.data.min_size; }, - dataIndex: 'size' + dataIndex: 'size', }, { text: 'Placement Groups', @@ -126,15 +126,15 @@ Ext.define('PVE.node.CephPoolList', { text: '# of PGs', // pg_num', width: 150, align: 'right', - dataIndex: 'pg_num' + dataIndex: 'pg_num', }, { text: gettext('Autoscale'), width: 140, align: 'right', - dataIndex: 'pg_autoscale_mode' + dataIndex: 'pg_autoscale_mode', }, - ] + ], }, { text: 'CRUSH Rule', @@ -143,14 +143,14 @@ Ext.define('PVE.node.CephPoolList', { text: 'ID', align: 'right', width: 50, - dataIndex: 'crush_rule' + dataIndex: 'crush_rule', }, { text: gettext('Name'), width: 150, dataIndex: 'crush_rule_name', }, - ] + ], }, { text: gettext('Used'), @@ -173,10 +173,10 @@ Ext.define('PVE.node.CephPoolList', { align: 'right', dataIndex: 'bytes_used', summaryType: 'sum', - summaryRenderer: PVE.Utils.render_size - } - ] - } + summaryRenderer: PVE.Utils.render_size, + }, + ], + }, ], initComponent: function() { var me = this; @@ -194,8 +194,8 @@ Ext.define('PVE.node.CephPoolList', { model: 'ceph-pool-list', proxy: { type: 'proxmox', - url: "/api2/json/nodes/" + nodename + "/ceph/pools" - } + url: "/api2/json/nodes/" + nodename + "/ceph/pools", + }, }); var store = Ext.create('Proxmox.data.DiffStore', { rstore: rstore }); @@ -208,7 +208,7 @@ Ext.define('PVE.node.CephPoolList', { me.mon(win, 'cephInstallWindowClosed', function(){ me.store.rstore.startUpdate(); }); - } + }, ); }); @@ -216,13 +216,13 @@ Ext.define('PVE.node.CephPoolList', { text: gettext('Create'), handler: function() { var win = Ext.create('PVE.CephCreatePool', { - nodename: nodename + nodename: nodename, }); win.show(); win.on('destroy', function() { rstore.load(); }); - } + }, }); var destroy_btn = Ext.create('Proxmox.button.Button', { @@ -242,14 +242,14 @@ Ext.define('PVE.node.CephPoolList', { showProgress: true, url: base_url, params: { - remove_storages: 1 + remove_storages: 1, }, - item: { type: 'CephPool', id: rec.data.pool_name } + item: { type: 'CephPool', id: rec.data.pool_name }, }).show(); win.on('destroy', function() { rstore.load(); }); - } + }, }); Ext.apply(me, { @@ -259,11 +259,11 @@ Ext.define('PVE.node.CephPoolList', { listeners: { activate: () => rstore.startUpdate(), destroy: () => rstore.stopUpdate(), - } + }, }); me.callParent(); - } + }, }, function() { Ext.define('ceph-pool-list', { @@ -276,9 +276,9 @@ Ext.define('PVE.node.CephPoolList', { { name: 'bytes_used', type: 'integer'}, { name: 'percent_used', type: 'number'}, { name: 'crush_rule', type: 'integer'}, - { name: 'crush_rule_name', type: 'string'} + { name: 'crush_rule_name', type: 'string'}, ], - idProperty: 'pool_name' + idProperty: 'pool_name', }); }); @@ -304,12 +304,12 @@ Ext.define('PVE.form.CephRuleSelector', { sorters: 'name', proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/ceph/rules' - } + url: '/api2/json/nodes/' + me.nodename + '/ceph/rules', + }, }); Ext.apply(me, { - store: store + store: store, }); me.callParent(); @@ -319,8 +319,8 @@ Ext.define('PVE.form.CephRuleSelector', { if (success && rec.length > 0) { me.select(rec[0]); } - } + }, }); - } + }, }); diff --git a/www/manager6/ceph/ServiceList.js b/www/manager6/ceph/ServiceList.js index 581bd554..4acf6ef2 100644 --- a/www/manager6/ceph/ServiceList.js +++ b/www/manager6/ceph/ServiceList.js @@ -25,9 +25,9 @@ Ext.define('PVE.CephCreateService', { change: function(f, value) { var me = this.up('pveCephCreateService'); me.setNode(value); - } - } - } + }, + }, + }, ], initComponent : function() { @@ -44,7 +44,7 @@ Ext.define('PVE.CephCreateService', { me.setNode(me.nodename); me.callParent(); - } + }, }); Ext.define('PVE.node.CephServiceList', { @@ -126,8 +126,8 @@ Ext.define('PVE.node.CephServiceList', { storeid: 'ceph-versions-' + view.type + '-list' + view.nodename, proxy: { type: 'proxmox', - url: "/api2/json/cluster/ceph/metadata?scope=versions" - } + url: "/api2/json/cluster/ceph/metadata?scope=versions", + }, }); view.versionsstore.on('load', this.getMaxVersions, this); @@ -140,13 +140,13 @@ Ext.define('PVE.node.CephServiceList', { model: 'ceph-service-list', proxy: { type: 'proxmox', - url: "/api2/json/nodes/" + view.nodename + "/ceph/" + view.type - } + url: "/api2/json/nodes/" + view.nodename + "/ceph/" + view.type, + }, }); view.setStore(Ext.create('Proxmox.data.DiffStore', { rstore: view.rstore, - sorters: [{ property: 'name' }] + sorters: [{ property: 'name' }], })); if (view.storeLoadCallback) { @@ -163,7 +163,7 @@ Ext.define('PVE.node.CephServiceList', { me.mon(win, 'cephInstallWindowClosed', function(){ view.rstore.startUpdate(); }); - } + }, ); }); } @@ -185,13 +185,13 @@ Ext.define('PVE.node.CephServiceList', { upid: upid, taskDone: function() { view.rstore.load(); - } + }, }); win.show(); }, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); }, onChangeService: function(btn) { @@ -216,8 +216,8 @@ Ext.define('PVE.node.CephServiceList', { items: [{ xtype: 'proxmoxLogView', url: url, - log_select_timespan: 1 - }] + log_select_timespan: 1, + }], }); win.show(); }, @@ -231,9 +231,9 @@ Ext.define('PVE.node.CephServiceList', { type: view.type, taskDone: function() { view.rstore.load(); - } + }, }); - } + }, }, tbar: [ @@ -247,7 +247,7 @@ Ext.define('PVE.node.CephServiceList', { return rec.data.state === 'stopped' || rec.data.state === 'unknown'; }, - handler: 'onChangeService' + handler: 'onChangeService', }, { xtype: 'proxmoxButton', @@ -258,7 +258,7 @@ Ext.define('PVE.node.CephServiceList', { return rec.data.state !== 'stopped'; }, disabled: true, - handler: 'onChangeService' + handler: 'onChangeService', }, { xtype: 'proxmoxButton', @@ -269,13 +269,13 @@ Ext.define('PVE.node.CephServiceList', { enableFn: function(rec) { return rec.data.state !== 'stopped'; }, - handler: 'onChangeService' + handler: 'onChangeService', }, '-', { text: gettext('Create'), reference: 'createButton', - handler: 'onCreate' + handler: 'onCreate', }, { text: gettext('Destroy'), @@ -299,18 +299,18 @@ Ext.define('PVE.node.CephServiceList', { upid: upid, taskDone: function() { view.rstore.load(); - } + }, }); win.show(); - } + }, }, '-', { xtype: 'proxmoxButton', text: gettext('Syslog'), disabled: true, - handler: 'showSyslog' - } + handler: 'showSyslog', + }, ], columns: [ @@ -321,7 +321,7 @@ Ext.define('PVE.node.CephServiceList', { renderer: function(v) { return this.type + '.' + v; }, - dataIndex: 'name' + dataIndex: 'name', }, { header: gettext('Host'), @@ -330,13 +330,13 @@ Ext.define('PVE.node.CephServiceList', { renderer: function(v) { return v || Proxmox.Utils.unknownText; }, - dataIndex: 'host' + dataIndex: 'host', }, { header: gettext('Status'), flex: 1, sortable: false, - dataIndex: 'state' + dataIndex: 'state', }, { header: gettext('Address'), @@ -345,7 +345,7 @@ Ext.define('PVE.node.CephServiceList', { renderer: function(v) { return v || Proxmox.Utils.unknownText; }, - dataIndex: 'addr' + dataIndex: 'addr', }, { header: gettext('Version'), @@ -353,7 +353,7 @@ Ext.define('PVE.node.CephServiceList', { sortable: true, dataIndex: 'version', renderer: 'render_version', - } + }, ], initComponent: function() { @@ -364,7 +364,7 @@ Ext.define('PVE.node.CephServiceList', { } me.callParent(); - } + }, }, function() { @@ -374,8 +374,8 @@ Ext.define('PVE.node.CephServiceList', { 'ceph_version', 'ceph_version_short', { type: 'string', name: 'version', calculate: function(data) { return PVE.Utils.parse_ceph_version(data); - } } + } }, ], - idProperty: 'name' + idProperty: 'name', }); }); diff --git a/www/manager6/ceph/Services.js b/www/manager6/ceph/Services.js index 5450e37e..5871117e 100644 --- a/www/manager6/ceph/Services.js +++ b/www/manager6/ceph/Services.js @@ -4,15 +4,15 @@ Ext.define('PVE.ceph.Services', { layout: { type: 'hbox', - align: 'stretch' + align: 'stretch', }, bodyPadding: '0 5 20', defaults: { xtype: 'box', style: { - 'text-align':'center' - } + 'text-align':'center', + }, }, items: [ @@ -20,20 +20,20 @@ Ext.define('PVE.ceph.Services', { flex: 1, xtype: 'pveCephServiceList', itemId: 'mons', - title: gettext('Monitors') + title: gettext('Monitors'), }, { flex: 1, xtype: 'pveCephServiceList', itemId: 'mgrs', - title: gettext('Managers') + title: gettext('Managers'), }, { flex: 1, xtype: 'pveCephServiceList', itemId: 'mdss', - title: gettext('Meta Data Servers') - } + title: gettext('Meta Data Servers'), + }, ], updateAll: function(metadata, status) { @@ -45,7 +45,7 @@ Ext.define('PVE.ceph.Services', { 'HEALTH_WARN': 2, 'HEALTH_UPGRADE': 3, 'HEALTH_OLD': 4, - 'HEALTH_OK': 5 + 'HEALTH_OK': 5, }; var healthmap = [ 'HEALTH_UNKNOWN', @@ -53,7 +53,7 @@ Ext.define('PVE.ceph.Services', { 'HEALTH_WARN', 'HEALTH_UPGRADE', 'HEALTH_OLD', - 'HEALTH_OK' + 'HEALTH_OK', ]; var reduceFn = function(first, second) { return first + '\n' + second.message; @@ -87,14 +87,14 @@ Ext.define('PVE.ceph.Services', { if (!monmessages[monid]) { monmessages[monid] = { worstSeverity: healthstates.HEALTH_OK, - messages: [] + messages: [], }; } monmessages[monid].messages.push( PVE.Utils.get_ceph_icon_html(value.severity, true) + - Ext.Array.reduce(value.detail, reduceFn, '') + Ext.Array.reduce(value.detail, reduceFn, ''), ); if (healthstates[value.severity] < monmessages[monid].worstSeverity) { monmessages[monid].worstSeverity = healthstates[value.severity]; @@ -153,7 +153,7 @@ Ext.define('PVE.ceph.Services', { } return mds; - } + }, }; for (let type of ['mon', 'mgr', 'mds']) { @@ -174,12 +174,12 @@ Ext.define('PVE.ceph.Services', { host: host, version: PVE.Utils.parse_ceph_version(metadata[type][id]), service: metadata[type][id].service, - addr: metadata[type][id].addr || metadata[type][id].addrs || Proxmox.Utils.unknownText + addr: metadata[type][id].addr || metadata[type][id].addrs || Proxmox.Utils.unknownText, }; result.statuses = [ gettext('Host') + ": " + result.host, - gettext('Address') + ": " + result.addr + gettext('Address') + ": " + result.addr, ]; if (checks[type]) { @@ -189,7 +189,7 @@ Ext.define('PVE.ceph.Services', { if (result.service && !result.version) { result.messages.push( PVE.Utils.get_ceph_icon_html('HEALTH_UNKNOWN', true) + - gettext('Stopped') + gettext('Stopped'), ); result.health = healthstates.HEALTH_UNKNOWN; } @@ -208,7 +208,7 @@ Ext.define('PVE.ceph.Services', { } result.messages.push( PVE.Utils.get_ceph_icon_html('HEALTH_OLD', true) + - gettext('A newer version was installed but old version still running, please restart') + gettext('A newer version was installed but old version still running, please restart'), ); } else { if (result.health > healthstates.HEALTH_UPGRADE) { @@ -216,7 +216,7 @@ Ext.define('PVE.ceph.Services', { } result.messages.push( PVE.Utils.get_ceph_icon_html('HEALTH_UPGRADE', true) + - gettext('Other cluster members use a newer version of this service, please upgrade and restart') + gettext('Other cluster members use a newer version of this service, please upgrade and restart'), ); } } @@ -234,7 +234,7 @@ Ext.define('PVE.ceph.Services', { me.getComponent('mons').updateAll(Object.values(me.mon)); me.getComponent('mgrs').updateAll(Object.values(me.mgr)); me.getComponent('mdss').updateAll(Object.values(me.mds)); - } + }, }); Ext.define('PVE.ceph.ServiceList', { @@ -242,23 +242,23 @@ Ext.define('PVE.ceph.ServiceList', { xtype: 'pveCephServiceList', style: { - 'text-align':'center' + 'text-align':'center', }, defaults: { xtype: 'box', style: { - 'text-align':'center' - } + 'text-align':'center', + }, }, items: [ { itemId: 'title', data: { - title: '' + title: '', }, - tpl: '

{title}

' - } + tpl: '

{title}

', + }, ], updateAll: function(list) { @@ -279,7 +279,7 @@ Ext.define('PVE.ceph.ServiceList', { // we can add it at the service+1 position (because of the title) service = me.insert(i+1, { xtype: 'pveCephServiceWidget', - itemId: list[i].id + itemId: list[i].id, }); if (!me.ids) { me.ids = []; @@ -302,9 +302,9 @@ Ext.define('PVE.ceph.ServiceList', { var me = this; me.callParent(); me.getComponent('title').update({ - title: me.title + title: me.title, }); - } + }, }); Ext.define('PVE.ceph.ServiceWidget', { @@ -316,12 +316,12 @@ Ext.define('PVE.ceph.ServiceWidget', { title: '0', health: 'HEALTH_ERR', text: '', - iconCls: PVE.Utils.get_health_icon() + iconCls: PVE.Utils.get_health_icon(), }, tpl: [ '{title}: ', - '' + '', ], updateService: function(title, text, health) { @@ -331,7 +331,7 @@ Ext.define('PVE.ceph.ServiceWidget', { health: health, text: text, title: title, - iconCls: PVE.Utils.get_health_icon(PVE.Utils.map_ceph_health[health]) + iconCls: PVE.Utils.get_health_icon(PVE.Utils.map_ceph_health[health]), })); if (me.tooltip) { @@ -360,11 +360,11 @@ Ext.define('PVE.ceph.ServiceWidget', { trackMouse: true, dismissDelay: 0, renderTo: Ext.getBody(), - html: me.data.text + html: me.data.text, }); } me.tooltip.show(); - } + }, }, mouseleave: { element: 'el', @@ -374,7 +374,7 @@ Ext.define('PVE.ceph.ServiceWidget', { me.tooltip.destroy(); delete me.tooltip; } - } - } - } + }, + }, + }, }); diff --git a/www/manager6/ceph/Status.js b/www/manager6/ceph/Status.js index 08c395bd..e33af2ba 100644 --- a/www/manager6/ceph/Status.js +++ b/www/manager6/ceph/Status.js @@ -9,11 +9,11 @@ Ext.define('PVE.node.CephStatus', { bodyPadding: 5, layout: { - type: 'column' + type: 'column', }, defaults: { - padding: 5 + padding: 5, }, items: [ @@ -25,16 +25,16 @@ Ext.define('PVE.node.CephStatus', { responsiveConfig: { 'width < 1900': { minHeight: 230, - columnWidth: 1 + columnWidth: 1, }, 'width >= 1900': { minHeight: 500, - columnWidth: 0.5 - } + columnWidth: 0.5, + }, }, layout: { type: 'hbox', - align: 'stretch' + align: 'stretch', }, items: [ { @@ -49,7 +49,7 @@ Ext.define('PVE.node.CephStatus', { flex: 1, itemId: 'overallhealth', xtype: 'pveHealthWidget', - title: gettext('Status') + title: gettext('Status'), }, { itemId: 'versioninfo', @@ -64,7 +64,7 @@ Ext.define('PVE.node.CephStatus', { style: { 'text-align': 'center', }, - } + }, ], }, { @@ -93,16 +93,16 @@ Ext.define('PVE.node.CephStatus', { return ''; }, sorter: { - sorterFn: function(a,b) { + sorterFn: function(a, b) { var healthArr = ['HEALTH_ERR', 'HEALTH_WARN', 'HEALTH_OK']; return healthArr.indexOf(b.data.severity) - healthArr.indexOf(a.data.severity); - } - } + }, + }, }, { dataIndex: 'summary', header: gettext('Summary'), - flex: 1 + flex: 1, }, { xtype: 'actioncolumn', @@ -120,7 +120,7 @@ Ext.define('PVE.node.CephStatus', { width: 650, height: 400, layout: { - type: 'fit' + type: 'fit', }, items: [{ scrollable: true, @@ -128,18 +128,18 @@ Ext.define('PVE.node.CephStatus', { xtype: 'box', html: [ '' + Ext.htmlEncode(record.data.summary) + '', - '
' + Ext.htmlEncode(record.data.detail) + '
' - ] - }] + '
' + Ext.htmlEncode(record.data.detail) + '
', + ], + }], }); win.show(); - } - } - ] - } - ] - } - ] + }, + }, + ], + }, + ], + }, + ], }, { xtype: 'pveCephStatusDetail', @@ -148,14 +148,14 @@ Ext.define('PVE.node.CephStatus', { responsiveConfig: { 'width < 1900': { columnWidth: 1, - minHeight: 250 + minHeight: 250, }, 'width >= 1900': { columnWidth: 0.5, - minHeight: 300 - } + minHeight: 300, + }, }, - title: gettext('Status') + title: gettext('Status'), }, { title: gettext('Services'), @@ -164,18 +164,18 @@ Ext.define('PVE.node.CephStatus', { plugins: 'responsive', layout: { type: 'hbox', - align: 'stretch' + align: 'stretch', }, responsiveConfig: { 'width < 1900': { columnWidth: 1, - minHeight: 200 + minHeight: 200, }, 'width >= 1900': { columnWidth: 0.5, - minHeight: 200 - } - } + minHeight: 200, + }, + }, }, { xtype: 'panel', @@ -184,7 +184,7 @@ Ext.define('PVE.node.CephStatus', { bodyPadding: 5, layout: { type: 'hbox', - align: 'center' + align: 'center', }, items: [ { @@ -194,7 +194,7 @@ Ext.define('PVE.node.CephStatus', { { xtype: 'proxmoxGauge', itemId: 'space', - title: gettext('Usage') + title: gettext('Usage'), }, { flex: 1, @@ -217,46 +217,46 @@ Ext.define('PVE.node.CephStatus', { xtype: 'progressbar', itemId: 'recoveryprogress', }, - ] + ], }, - ] + ], }, { flex: 2, xtype: 'container', defaults: { padding: 0, - height: 100 + height: 100, }, items: [ { itemId: 'reads', xtype: 'pveRunningChart', title: gettext('Reads'), - renderer: PVE.Utils.render_bandwidth + renderer: PVE.Utils.render_bandwidth, }, { itemId: 'writes', xtype: 'pveRunningChart', title: gettext('Writes'), - renderer: PVE.Utils.render_bandwidth + renderer: PVE.Utils.render_bandwidth, }, { itemId: 'readiops', xtype: 'pveRunningChart', title: 'IOPS: ' + gettext('Reads'), - renderer: Ext.util.Format.numberRenderer('0,000') + renderer: Ext.util.Format.numberRenderer('0,000'), }, { itemId: 'writeiops', xtype: 'pveRunningChart', title: 'IOPS: ' + gettext('Writes'), - renderer: Ext.util.Format.numberRenderer('0,000') + renderer: Ext.util.Format.numberRenderer('0,000'), }, - ] - } - ] - } + ], + }, + ], + }, ], generateCheckData: function(health) { @@ -274,9 +274,9 @@ Ext.define('PVE.node.CephStatus', { function(first, second) { return first + '\n' + second.message; }, - '' + '', ), - severity: checks[key].severity + severity: checks[key].severity, }); }); @@ -310,7 +310,7 @@ Ext.define('PVE.node.CephStatus', { var text = Ext.String.format(gettext('{0} of {1}'), PVE.Utils.render_size(used), - PVE.Utils.render_size(total) + PVE.Utils.render_size(total), ); // update the usage widget @@ -369,8 +369,8 @@ Ext.define('PVE.node.CephStatus', { interval: 5000, proxy: { type: 'proxmox', - url: baseurl + '/status' - } + url: baseurl + '/status', + }, }); me.metadatastore = Ext.create('Proxmox.data.UpdateStore', { @@ -378,8 +378,8 @@ Ext.define('PVE.node.CephStatus', { interval: 15*1000, proxy: { type: 'proxmox', - url: '/api2/json/cluster/ceph/metadata' - } + url: '/api2/json/cluster/ceph/metadata', + }, }); // save references for the updatefunction @@ -397,7 +397,7 @@ Ext.define('PVE.node.CephStatus', { me.mon(win, 'cephInstallWindowClosed', function(){ me.store.startUpdate(); }); - } + }, ); }); @@ -431,6 +431,6 @@ Ext.define('PVE.node.CephStatus', { me.on('destroy', me.metadatastore.stopUpdate); me.store.startUpdate(); me.metadatastore.startUpdate(); - } + }, }); diff --git a/www/manager6/ceph/StatusDetail.js b/www/manager6/ceph/StatusDetail.js index f085d9b5..e3b38958 100644 --- a/www/manager6/ceph/StatusDetail.js +++ b/www/manager6/ceph/StatusDetail.js @@ -4,15 +4,15 @@ Ext.define('PVE.ceph.StatusDetail', { layout: { type: 'hbox', - align: 'stretch' + align: 'stretch', }, bodyPadding: '0 5', defaults: { xtype: 'box', style: { - 'text-align':'center' - } + 'text-align':'center', + }, }, items: [{ @@ -27,7 +27,7 @@ Ext.define('PVE.ceph.StatusDetail', { upout: 0, downin: 0, downout: 0, - oldosds: [] + oldosds: [], }, tpl: [ '

' + 'OSDs' + '

', @@ -68,8 +68,8 @@ Ext.define('PVE.ceph.StatusDetail', { '
', '', '', - '' - ] + '', + ], }, { flex: 1, @@ -83,7 +83,7 @@ Ext.define('PVE.ceph.StatusDetail', { '#CFCFCF', '#21BF4B', '#FFCC00', - '#FF6C59' + '#FF6C59', ], store: { }, series: [ @@ -101,13 +101,13 @@ Ext.define('PVE.ceph.StatusDetail', { state.state_name + ': ' + state.count.toString(); }); tooltip.setHtml(html); - } + }, }, subStyle: { - strokeStyle: false - } - } - ] + strokeStyle: false, + }, + }, + ], }, { flex: 1.6, @@ -116,7 +116,7 @@ Ext.define('PVE.ceph.StatusDetail', { maxHeight: 250, scrollable: true, data: { - states: [] + states: [], }, tpl: [ '

' + 'PGs' + '

', @@ -124,8 +124,8 @@ Ext.define('PVE.ceph.StatusDetail', { '
{state_name}:
', '
{count}

', '
', - '' - ] + '', + ], }], // similar to mgr dashboard @@ -163,7 +163,7 @@ Ext.define('PVE.ceph.StatusDetail', { recovery_unfound: 3, snaptrim_error: 3, stale: 3, - undersized: 3 + undersized: 3, }, statecategories: [ @@ -171,20 +171,20 @@ Ext.define('PVE.ceph.StatusDetail', { text: gettext('Unknown'), count: 0, states: [], - cls: 'faded' + cls: 'faded', }, { text: gettext('Clean'), - cls: 'good' + cls: 'good', }, { text: gettext('Working'), - cls: 'warning' + cls: 'warning', }, { text: gettext('Error'), - cls: 'critical' - } + cls: 'critical', + }, ], updateAll: function(metadata, status) { @@ -206,7 +206,7 @@ Ext.define('PVE.ceph.StatusDetail', { if (version != maxversion) { oldosds.push({ id: osd.id, - version: version + version: version, }); } }); @@ -215,7 +215,7 @@ Ext.define('PVE.ceph.StatusDetail', { // update PGs sorted var pgmap = status.pgmap || {}; var pgs_by_state = pgmap.pgs_by_state || []; - pgs_by_state.sort(function(a,b){ + pgs_by_state.sort(function(a, b){ return (a.state_name < b.state_name)?-1:(a.state_name === b.state_name)?0:1; }); @@ -253,7 +253,7 @@ Ext.define('PVE.ceph.StatusDetail', { if (key === 'OSD_DOWN') { found = value.summary.message.match(downinregex); if (found !== null) { - downin_osds = parseInt(found[1],10); + downin_osds = parseInt(found[1], 10); } } }); @@ -278,13 +278,13 @@ Ext.define('PVE.ceph.StatusDetail', { upout: upout_osds, downin: downin_osds, downout: downout_osds, - oldosds: oldosds + oldosds: oldosds, }; var osdcomponent = me.getComponent('osds'); osdcomponent.update(Ext.apply(osdcomponent.data, osds)); me.suspendLayout = false; me.updateLayout(); - } + }, }); diff --git a/www/manager6/controller/StorageEdit.js b/www/manager6/controller/StorageEdit.js index a10c8fc9..4246d363 100644 --- a/www/manager6/controller/StorageEdit.js +++ b/www/manager6/controller/StorageEdit.js @@ -15,7 +15,7 @@ Ext.define('PVE.controller.StorageEdit', { maxfiles.reset(); } maxfiles.setDisabled(!hasBackups); - } - } - } + }, + }, + }, }); diff --git a/www/manager6/data/ResourceStore.js b/www/manager6/data/ResourceStore.js index 39928063..2ece3dee 100644 --- a/www/manager6/data/ResourceStore.js +++ b/www/manager6/data/ResourceStore.js @@ -65,14 +65,14 @@ Ext.define('PVE.data.ResourceStore', { renderer: PVE.Utils.render_resource_type, sortable: true, hideable: false, - width: 100 + width: 100, }, id: { header: 'ID', type: 'string', hidden: true, sortable: true, - width: 80 + width: 80, }, running: { header: gettext('Online'), @@ -82,7 +82,7 @@ Ext.define('PVE.data.ResourceStore', { convert: function(value, record) { var info = record.data; return (Ext.isNumeric(info.uptime) && (info.uptime > 0)); - } + }, }, text: { header: gettext('Description'), @@ -110,20 +110,20 @@ Ext.define('PVE.data.ResourceStore', { } return text; - } + }, }, vmid: { header: 'VMID', type: 'integer', hidden: true, sortable: true, - width: 80 + width: 80, }, name: { header: gettext('Name'), hidden: true, sortable: true, - type: 'string' + type: 'string', }, disk: { header: gettext('Disk usage'), @@ -131,7 +131,7 @@ Ext.define('PVE.data.ResourceStore', { renderer: PVE.Utils.render_disk_usage, sortable: true, width: 100, - hidden: true + hidden: true, }, diskuse: { header: gettext('Disk usage') + " %", @@ -140,7 +140,7 @@ Ext.define('PVE.data.ResourceStore', { renderer: PVE.Utils.render_disk_usage_percent, width: 100, calculate: PVE.Utils.calculate_disk_usage, - sortType: 'asFloat' + sortType: 'asFloat', }, maxdisk: { header: gettext('Disk size'), @@ -148,7 +148,7 @@ Ext.define('PVE.data.ResourceStore', { renderer: PVE.Utils.render_size, sortable: true, hidden: true, - width: 100 + width: 100, }, mem: { header: gettext('Memory usage'), @@ -156,7 +156,7 @@ Ext.define('PVE.data.ResourceStore', { renderer: PVE.Utils.render_mem_usage, sortable: true, hidden: true, - width: 100 + width: 100, }, memuse: { header: gettext('Memory usage') + " %", @@ -165,7 +165,7 @@ Ext.define('PVE.data.ResourceStore', { calculate: PVE.Utils.calculate_mem_usage, sortType: 'asFloat', sortable: true, - width: 100 + width: 100, }, maxmem: { header: gettext('Memory size'), @@ -173,21 +173,21 @@ Ext.define('PVE.data.ResourceStore', { renderer: PVE.Utils.render_size, hidden: true, sortable: true, - width: 100 + width: 100, }, cpu: { header: gettext('CPU usage'), type: 'float', renderer: PVE.Utils.render_cpu, sortable: true, - width: 100 + width: 100, }, maxcpu: { header: gettext('maxcpu'), type: 'integer', hidden: true, sortable: true, - width: 60 + width: 60, }, diskread: { header: gettext('Total Disk Read'), @@ -195,7 +195,7 @@ Ext.define('PVE.data.ResourceStore', { hidden: true, sortable: true, renderer: Proxmox.Utils.format_size, - width: 100 + width: 100, }, diskwrite: { header: gettext('Total Disk Write'), @@ -203,7 +203,7 @@ Ext.define('PVE.data.ResourceStore', { hidden: true, sortable: true, renderer: Proxmox.Utils.format_size, - width: 100 + width: 100, }, netin: { header: gettext('Total NetIn'), @@ -211,7 +211,7 @@ Ext.define('PVE.data.ResourceStore', { hidden: true, sortable: true, renderer: Proxmox.Utils.format_size, - width: 100 + width: 100, }, netout: { header: gettext('Total NetOut'), @@ -219,64 +219,64 @@ Ext.define('PVE.data.ResourceStore', { hidden: true, sortable: true, renderer: Proxmox.Utils.format_size, - width: 100 + width: 100, }, template: { header: gettext('Template'), type: 'integer', hidden: true, sortable: true, - width: 60 + width: 60, }, uptime: { header: gettext('Uptime'), type: 'integer', renderer: Proxmox.Utils.render_uptime, sortable: true, - width: 110 + width: 110, }, node: { header: gettext('Node'), type: 'string', hidden: true, sortable: true, - width: 110 + width: 110, }, storage: { header: gettext('Storage'), type: 'string', hidden: true, sortable: true, - width: 110 + width: 110, }, pool: { header: gettext('Pool'), type: 'string', hidden: true, sortable: true, - width: 110 + width: 110, }, hastate: { header: gettext('HA State'), type: 'string', defaultValue: 'unmanaged', hidden: true, - sortable: true + sortable: true, }, status: { header: gettext('Status'), type: 'string', hidden: true, sortable: true, - width: 110 + width: 110, }, lock: { header: gettext('Lock'), type: 'string', hidden: true, sortable: true, - width: 110 - } + width: 110, + }, }; var fields = []; @@ -304,14 +304,14 @@ Ext.define('PVE.data.ResourceStore', { fields: fields, proxy: { type: 'proxmox', - url: '/api2/json/cluster/resources' - } + url: '/api2/json/cluster/resources', + }, }); Ext.define('PVETree', { extend: "Ext.data.Model", fields: fields, - proxy: { type: 'memory' } + proxy: { type: 'memory' }, }); Ext.apply(config, { @@ -325,9 +325,9 @@ Ext.define('PVE.data.ResourceStore', { }); return res; }, - fieldNames: fieldNames + fieldNames: fieldNames, }); me.callParent([config]); - } + }, }); diff --git a/www/manager6/data/model/RRDModels.js b/www/manager6/data/model/RRDModels.js index 0c8a12bd..5e57626e 100644 --- a/www/manager6/data/model/RRDModels.js +++ b/www/manager6/data/model/RRDModels.js @@ -6,14 +6,14 @@ Ext.define('pve-rrd-node', { // percentage convert: function(value) { return value*100; - } + }, }, { name:'iowait', // percentage convert: function(value) { return value*100; - } + }, }, 'loadavg', 'maxcpu', @@ -25,8 +25,8 @@ Ext.define('pve-rrd-node', { 'rootused', 'swaptotal', 'swapused', - { type: 'date', dateFormat: 'timestamp', name: 'time' } - ] + { type: 'date', dateFormat: 'timestamp', name: 'time' }, + ], }); Ext.define('pve-rrd-guest', { @@ -37,7 +37,7 @@ Ext.define('pve-rrd-guest', { // percentage convert: function(value) { return value*100; - } + }, }, 'maxcpu', 'netin', @@ -48,8 +48,8 @@ Ext.define('pve-rrd-guest', { 'maxdisk', 'diskread', 'diskwrite', - { type: 'date', dateFormat: 'timestamp', name: 'time' } - ] + { type: 'date', dateFormat: 'timestamp', name: 'time' }, + ], }); Ext.define('pve-rrd-storage', { @@ -57,6 +57,6 @@ Ext.define('pve-rrd-storage', { fields: [ 'used', 'total', - { type: 'date', dateFormat: 'timestamp', name: 'time' } - ] + { type: 'date', dateFormat: 'timestamp', name: 'time' }, + ], }); diff --git a/www/manager6/dc/ACLView.js b/www/manager6/dc/ACLView.js index e9928b0f..b9040694 100644 --- a/www/manager6/dc/ACLView.js +++ b/www/manager6/dc/ACLView.js @@ -16,8 +16,8 @@ Ext.define('PVE.dc.ACLAdd', { name: 'path', value: me.path, allowBlank: false, - fieldLabel: gettext('Path') - } + fieldLabel: gettext('Path'), + }, ]; if (me.aclType === 'group') { @@ -25,21 +25,21 @@ Ext.define('PVE.dc.ACLAdd', { items.push({ xtype: 'pveGroupSelector', name: 'groups', - fieldLabel: gettext('Group') + fieldLabel: gettext('Group'), }); } else if (me.aclType === 'user') { me.subject = gettext("User Permission"); items.push({ xtype: 'pveUserSelector', name: 'users', - fieldLabel: gettext('User') + fieldLabel: gettext('User'), }); } else if (me.aclType === 'token') { me.subject = gettext("API Token Permission"); items.push({ xtype: 'pveTokenSelector', name: 'tokens', - fieldLabel: gettext('API Token') + fieldLabel: gettext('API Token'), }); } else { throw "unknown ACL type"; @@ -49,7 +49,7 @@ Ext.define('PVE.dc.ACLAdd', { xtype: 'pmxRoleSelector', name: 'roles', value: 'NoAccess', - fieldLabel: gettext('Role') + fieldLabel: gettext('Role'), }); if (!me.path) { @@ -58,21 +58,21 @@ Ext.define('PVE.dc.ACLAdd', { name: 'propagate', checked: true, uncheckedValue: 0, - fieldLabel: gettext('Propagate') + fieldLabel: gettext('Propagate'), }); } var ipanel = Ext.create('Proxmox.panel.InputPanel', { items: items, - onlineHelp: 'pveum_permission_management' + onlineHelp: 'pveum_permission_management', }); Ext.apply(me, { - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); - } + }, }); Ext.define('PVE.dc.ACLView', { @@ -91,25 +91,25 @@ Ext.define('PVE.dc.ACLView', { initComponent : function() { var me = this; - var store = Ext.create('Ext.data.Store',{ + var store = Ext.create('Ext.data.Store', { model: 'pve-acl', proxy: { type: 'proxmox', - url: "/api2/json/access/acl" + url: "/api2/json/access/acl", }, sorters: { property: 'path', - order: 'DESC' - } + order: 'DESC', + }, }); if (me.path) { - store.addFilter(Ext.create('Ext.util.Filter',{ + store.addFilter(Ext.create('Ext.util.Filter', { filterFn: function(item) { if (item.data.path === me.path) { return true; } - } + }, })); } @@ -127,14 +127,14 @@ Ext.define('PVE.dc.ACLView', { flex: 1, sortable: true, renderer: render_ugid, - dataIndex: 'ugid' + dataIndex: 'ugid', }, { header: gettext('Role'), flex: 1, sortable: true, - dataIndex: 'roleid' - } + dataIndex: 'roleid', + }, ]; if (!me.path) { @@ -142,13 +142,13 @@ Ext.define('PVE.dc.ACLView', { header: gettext('Path'), flex: 1, sortable: true, - dataIndex: 'path' + dataIndex: 'path', }); columns.push({ header: gettext('Propagate'), width: 80, sortable: true, - dataIndex: 'propagate' + dataIndex: 'propagate', }); } @@ -167,7 +167,7 @@ Ext.define('PVE.dc.ACLView', { var params = { 'delete': 1, path: rec.data.path, - roles: rec.data.roleid + roles: rec.data.roleid, }; if (rec.data.type === 'group') { params.groups = rec.data.ugid; @@ -189,9 +189,9 @@ Ext.define('PVE.dc.ACLView', { }, failure: function (response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); - } + }, }); Proxmox.Utils.monStoreErrors(me, store); @@ -209,54 +209,54 @@ Ext.define('PVE.dc.ACLView', { text: gettext('Group Permission'), iconCls: 'fa fa-fw fa-group', handler: function() { - var win = Ext.create('PVE.dc.ACLAdd',{ + var win = Ext.create('PVE.dc.ACLAdd', { aclType: 'group', - path: me.path + path: me.path, }); win.on('destroy', reload); win.show(); - } + }, }, { text: gettext('User Permission'), iconCls: 'fa fa-fw fa-user', handler: function() { - var win = Ext.create('PVE.dc.ACLAdd',{ + var win = Ext.create('PVE.dc.ACLAdd', { aclType: 'user', - path: me.path + path: me.path, }); win.on('destroy', reload); win.show(); - } + }, }, { text: gettext('API Token Permission'), iconCls: 'fa fa-fw fa-user-o', handler: function() { - var win = Ext.create('PVE.dc.ACLAdd',{ + var win = Ext.create('PVE.dc.ACLAdd', { aclType: 'token', - path: me.path + path: me.path, }); win.on('destroy', reload); win.show(); - } - } - ] - } + }, + }, + ], + }, }, - remove_btn + remove_btn, ], viewConfig: { - trackOver: false + trackOver: false, }, columns: columns, listeners: { - activate: reload - } + activate: reload, + }, }); me.callParent(); - } + }, }, function() { Ext.define('pve-acl', { @@ -265,9 +265,9 @@ Ext.define('PVE.dc.ACLView', { 'path', 'type', 'ugid', 'roleid', { name: 'propagate', - type: 'boolean' - } - ] + type: 'boolean', + }, + ], }); }); diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js index 059d01c7..4e49438f 100644 --- a/www/manager6/dc/Backup.js +++ b/www/manager6/dc/Backup.js @@ -21,7 +21,7 @@ Ext.define('PVE.dc.BackupEdit', { } var vmidField = Ext.create('Ext.form.field.Hidden', { - name: 'vmid' + name: 'vmid', }); // 'value' can be assigned a string or an array @@ -31,11 +31,11 @@ Ext.define('PVE.dc.BackupEdit', { ['include', gettext('Include selected VMs')], ['all', gettext('All')], ['exclude', gettext('Exclude selected VMs')], - ['pool', gettext('Pool based')] + ['pool', gettext('Pool based')], ], fieldLabel: gettext('Selection mode'), name: 'selMode', - value: '' + value: '', }); var sm = Ext.create('Ext.selection.CheckboxModel', { @@ -52,8 +52,8 @@ Ext.define('PVE.dc.BackupEdit', { vmidField.suspendEvent('change'); vmidField.setValue(sel); vmidField.resumeEvent('change'); - } - } + }, + }, }); var storagesel = Ext.create('PVE.form.StorageSelector', { @@ -74,16 +74,16 @@ Ext.define('PVE.dc.BackupEdit', { } else if (!compressionSelector.getEditable()) { compressionSelector.setDisabled(false); } - } - } + }, + }, }); var store = new Ext.data.Store({ model: 'PVEResources', sorters: { property: 'vmid', - order: 'ASC' - } + order: 'ASC', + }, }); var vmgrid = Ext.createWidget('grid', { @@ -96,11 +96,11 @@ Ext.define('PVE.dc.BackupEdit', { { header: 'ID', dataIndex: 'vmid', - width: 60 + width: 60, }, { header: gettext('Node'), - dataIndex: 'node' + dataIndex: 'node', }, { header: gettext('Status'), @@ -111,18 +111,18 @@ Ext.define('PVE.dc.BackupEdit', { } else { return Proxmox.Utils.stoppedText; } - } + }, }, { header: gettext('Name'), dataIndex: 'name', - flex: 1 + flex: 1, }, { header: gettext('Type'), - dataIndex: 'type' - } - ] + dataIndex: 'type', + }, + ], }); var selectPoolMembers = function(poolid) { @@ -134,8 +134,8 @@ Ext.define('PVE.dc.BackupEdit', { { id: 'poolFilter', property: 'pool', - value: poolid - } + value: poolid, + }, ]); sm.selectAll(true); }; @@ -148,8 +148,8 @@ Ext.define('PVE.dc.BackupEdit', { listeners: { change: function( selpool, newValue, oldValue) { selectPoolMembers(newValue); - } - } + }, + }, }); var nodesel = Ext.create('PVE.form.NodeSelector', { @@ -174,8 +174,8 @@ Ext.define('PVE.dc.BackupEdit', { if (mode === 'pool') { selectPoolMembers(selPool.value); } - } - } + }, + }, }); var column1 = [ @@ -187,7 +187,7 @@ Ext.define('PVE.dc.BackupEdit', { fieldLabel: gettext('Day of week'), multiSelect: true, value: ['sat'], - allowBlank: false + allowBlank: false, }, { xtype: 'timefield', @@ -196,37 +196,37 @@ Ext.define('PVE.dc.BackupEdit', { format: 'H:i', formatText: 'HH:MM', value: '00:00', - allowBlank: false + allowBlank: false, }, selModeField, - selPool + selPool, ]; var column2 = [ { xtype: 'textfield', fieldLabel: gettext('Send email to'), - name: 'mailto' + name: 'mailto', }, { xtype: 'pveEmailNotificationSelector', fieldLabel: gettext('Email notification'), name: 'mailnotification', deleteEmpty: me.isCreate ? false : true, - value: me.isCreate ? 'always' : '' + value: me.isCreate ? 'always' : '', }, { xtype: 'pveCompressionSelector', fieldLabel: gettext('Compression'), name: 'compress', deleteEmpty: me.isCreate ? false : true, - value: 'zstd' + value: 'zstd', }, { xtype: 'pveBackupModeSelector', fieldLabel: gettext('Mode'), value: 'snapshot', - name: 'mode' + name: 'mode', }, { xtype: 'proxmoxcheckbox', @@ -234,9 +234,9 @@ Ext.define('PVE.dc.BackupEdit', { name: 'enabled', uncheckedValue: 0, defaultValue: 1, - checked: true + checked: true, }, - vmidField + vmidField, ]; var ipanel = Ext.create('Proxmox.panel.InputPanel', { @@ -270,7 +270,7 @@ Ext.define('PVE.dc.BackupEdit', { delete values.pool; } return values; - } + }, }); var update_vmid_selection = function(list, mode) { @@ -342,7 +342,7 @@ Ext.define('PVE.dc.BackupEdit', { } else { update_vmid_selection(list, mode); } - } + }, }); }; @@ -350,7 +350,7 @@ Ext.define('PVE.dc.BackupEdit', { subject: gettext("Backup Job"), url: url, method: method, - items: [ ipanel, vmgrid ] + items: [ ipanel, vmgrid ], }); me.callParent(); @@ -380,12 +380,12 @@ Ext.define('PVE.dc.BackupEdit', { } me.setValues(data); - } + }, }); } reload(); - } + }, }); @@ -416,7 +416,7 @@ Ext.define('PVE.dc.BackupDiskTree', { scope: this, callback: function(panel) { panel.collapseAll(); - } + }, }, ], @@ -500,8 +500,8 @@ Ext.define('PVE.dc.BackupDiskTree', { } else { return txt + 'question-circle'; } - } - } + }, + }, ], header: { items: [{ @@ -547,16 +547,16 @@ Ext.define('PVE.dc.BackupDiskTree', { }); return match; }); - } - } - } + }, + }, + }, ]}, }); me.callParent(); me.reload(); - } + }, }); Ext.define('PVE.dc.BackupInfo', { @@ -603,7 +603,7 @@ Ext.define('PVE.dc.BackupInfo', { name: 'pool', fieldLabel: gettext('Pool to backup'), xtype: 'displayfield', - } + }, ], column2: [ { @@ -709,7 +709,7 @@ Ext.define('PVE.dc.BackupInfo', { me.callParent(); me.setValues(me.record); - } + }, }); @@ -783,9 +783,9 @@ Ext.define('PVE.dc.BackedGuests', { }); return match; }); - } - } - } + }, + }, + }, ], viewConfig: { stripeRows: true, @@ -812,8 +812,8 @@ Ext.define('PVE.dc.BackupView', { model: 'pve-cluster-backup', proxy: { type: 'proxmox', - url: "/api2/json/cluster/backup" - } + url: "/api2/json/cluster/backup", + }, }); var not_backed_store = new Ext.data.Store({ @@ -848,7 +848,7 @@ Ext.define('PVE.dc.BackupView', { } var win = Ext.create('PVE.dc.BackupEdit', { - jobid: rec.data.id + jobid: rec.data.id, }); win.on('destroy', reload); win.show(); @@ -886,10 +886,10 @@ Ext.define('PVE.dc.BackupView', { region: 'center', layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, items: [infoview, disktree], - }] + }], }).show(); }; @@ -949,7 +949,7 @@ Ext.define('PVE.dc.BackupView', { errors.push(node + ': ' + response.htmlStatus); postRequest(); }, - success: postRequest + success: postRequest, })); }; @@ -974,10 +974,10 @@ Ext.define('PVE.dc.BackupView', { region: 'center', layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, items: [backedinfo], - }] + }], }).show(); }; @@ -985,7 +985,7 @@ Ext.define('PVE.dc.BackupView', { text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); var run_btn = new Proxmox.button.Button({ @@ -1008,9 +1008,9 @@ Ext.define('PVE.dc.BackupView', { return; } run_backup_now(rec.data); - } + }, }); - } + }, }); var remove_btn = Ext.create('Proxmox.button.StdRemoveButton', { @@ -1018,7 +1018,7 @@ Ext.define('PVE.dc.BackupView', { baseurl: '/cluster/backup', callback: function() { reload(); - } + }, }); var detail_btn = new Proxmox.button.Button({ @@ -1048,16 +1048,16 @@ Ext.define('PVE.dc.BackupView', { stateful: true, stateId: 'grid-dc-backup', viewConfig: { - trackOver: false + trackOver: false, }, tbar: [ { text: gettext('Add'), handler: function() { - var win = Ext.create('PVE.dc.BackupEdit',{}); + var win = Ext.create('PVE.dc.BackupEdit', {}); win.on('destroy', reload); win.show(); - } + }, }, '-', remove_btn, @@ -1078,7 +1078,7 @@ Ext.define('PVE.dc.BackupView', { sortable: true, disabled: true, disabledCls: 'x-item-enabled', - stopSelection: false + stopSelection: false, }, { header: gettext('Node'), @@ -1090,43 +1090,43 @@ Ext.define('PVE.dc.BackupView', { return value; } return me.allText; - } + }, }, { header: gettext('Day of week'), width: 200, sortable: false, dataIndex: 'dow', - renderer: PVE.Utils.render_backup_days_of_week + renderer: PVE.Utils.render_backup_days_of_week, }, { header: gettext('Start Time'), width: 60, sortable: true, - dataIndex: 'starttime' + dataIndex: 'starttime', }, { header: gettext('Storage'), width: 100, sortable: true, - dataIndex: 'storage' + dataIndex: 'storage', }, { header: gettext('Selection'), flex: 1, sortable: false, dataIndex: 'vmid', - renderer: PVE.Utils.render_backup_selection - } + renderer: PVE.Utils.render_backup_selection, + }, ], listeners: { activate: reload, - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }); me.callParent(); - } + }, }, function() { Ext.define('pve-cluster-backup', { @@ -1136,7 +1136,7 @@ Ext.define('PVE.dc.BackupView', { 'storage', 'node', 'vmid', 'exclude', 'mailto', 'pool', 'compress', 'mode', { name: 'enabled', type: 'boolean' }, - { name: 'all', type: 'boolean' } - ] + { name: 'all', type: 'boolean' }, + ], }); }); diff --git a/www/manager6/dc/Cluster.js b/www/manager6/dc/Cluster.js index 396bd0a6..a6a371be 100644 --- a/www/manager6/dc/Cluster.js +++ b/www/manager6/dc/Cluster.js @@ -2,21 +2,21 @@ Ext.define('pve-cluster-nodes', { extend: 'Ext.data.Model', fields: [ 'node', { type: 'integer', name: 'nodeid' }, 'ring0_addr', 'ring1_addr', - { type: 'integer', name: 'quorum_votes' } + { type: 'integer', name: 'quorum_votes' }, ], proxy: { type: 'proxmox', - url: "/api2/json/cluster/config/nodes" + url: "/api2/json/cluster/config/nodes", }, - idProperty: 'nodeid' + idProperty: 'nodeid', }); Ext.define('pve-cluster-info', { extend: 'Ext.data.Model', proxy: { type: 'proxmox', - url: "/api2/json/cluster/config/join" - } + url: "/api2/json/cluster/config/join", + }, }); Ext.define('PVE.ClusterAdministration', { @@ -37,11 +37,11 @@ Ext.define('PVE.ClusterAdministration', { preferred_node: { name: '', fp: '', - addr: '' + addr: '', }, isInCluster: false, - nodecount: 0 - } + nodecount: 0, + }, }, items: [ @@ -56,7 +56,7 @@ Ext.define('PVE.ClusterAdministration', { autoStart: true, interval: 15 * 1000, storeid: 'pve-cluster-info', - model: 'pve-cluster-info' + model: 'pve-cluster-info', }); view.store.on('load', this.onLoad, this); view.on('destroy', view.store.stopUpdate); @@ -71,7 +71,7 @@ Ext.define('PVE.ClusterAdministration', { vm.set('preferred_node', { name: '', addr: '', - fp: '' + fp: '', }); return; } @@ -96,7 +96,7 @@ Ext.define('PVE.ClusterAdministration', { addr: nodeinfo.pve_addr, peerLinks: links, ring_addr: ring_addr, - fp: nodeinfo.pve_fp + fp: nodeinfo.pve_fp, }); }, @@ -108,8 +108,8 @@ Ext.define('PVE.ClusterAdministration', { listeners: { destroy: function() { view.store.startUpdate(); - } - } + }, + }, }); }, @@ -121,8 +121,8 @@ Ext.define('PVE.ClusterAdministration', { fingerprint: vm.get('preferred_node.fp'), peerLinks: vm.get('preferred_node.peerLinks'), ring_addr: vm.get('preferred_node.ring_addr'), - totem: vm.get('totem') - } + totem: vm.get('totem'), + }, }); win.show(); }, @@ -135,10 +135,10 @@ Ext.define('PVE.ClusterAdministration', { listeners: { destroy: function() { view.store.startUpdate(); - } - } + }, + }, }); - } + }, }, tbar: [ { @@ -146,25 +146,25 @@ Ext.define('PVE.ClusterAdministration', { reference: 'createButton', handler: 'onCreate', bind: { - disabled: '{isInCluster}' - } + disabled: '{isInCluster}', + }, }, { text: gettext('Join Information'), reference: 'addButton', handler: 'onClusterInfo', bind: { - disabled: '{!isInCluster}' - } + disabled: '{!isInCluster}', + }, }, { text: gettext('Join Cluster'), reference: 'joinButton', handler: 'onJoin', bind: { - disabled: '{isInCluster}' - } - } + disabled: '{isInCluster}', + }, + }, ], layout: 'hbox', bodyPadding: 5, @@ -174,18 +174,18 @@ Ext.define('PVE.ClusterAdministration', { fieldLabel: gettext('Cluster Name'), bind: { value: '{totem.cluster_name}', - hidden: '{!isInCluster}' + hidden: '{!isInCluster}', }, - flex: 1 + flex: 1, }, { xtype: 'displayfield', fieldLabel: gettext('Config Version'), bind: { value: '{totem.config_version}', - hidden: '{!isInCluster}' + hidden: '{!isInCluster}', }, - flex: 1 + flex: 1, }, { xtype: 'displayfield', @@ -193,19 +193,19 @@ Ext.define('PVE.ClusterAdministration', { labelWidth: 120, bind: { value: '{nodecount}', - hidden: '{!isInCluster}' + hidden: '{!isInCluster}', }, - flex: 1 + flex: 1, }, { xtype: 'displayfield', value: gettext('Standalone node - no cluster defined'), bind: { - hidden: '{isInCluster}' + hidden: '{isInCluster}', }, - flex: 1 - } - ] + flex: 1, + }, + ], }, { xtype: 'grid', @@ -222,14 +222,14 @@ Ext.define('PVE.ClusterAdministration', { interval: 5 * 1000, autoStart: true, storeid: 'pve-cluster-nodes', - model: 'pve-cluster-nodes' + model: 'pve-cluster-nodes', }); view.setStore(Ext.create('Proxmox.data.DiffStore', { rstore: view.rstore, sorters: { property: 'nodeid', - order: 'DESC' - } + order: 'DESC', + }, })); Proxmox.Utils.monStoreErrors(view, view.rstore); view.rstore.on('load', this.onLoad, this); @@ -266,16 +266,16 @@ Ext.define('PVE.ClusterAdministration', { return; } view.columns[linkIndex+linknum].setHidden(false); - } + }, ); - } + }, }, columns: { items: [ { header: gettext('Nodename'), hidden: false, - dataIndex: 'name' + dataIndex: 'name', }, { header: gettext('ID'), @@ -283,7 +283,7 @@ Ext.define('PVE.ClusterAdministration', { width: 100, flex: 0, hidden: false, - dataIndex: 'nodeid' + dataIndex: 'nodeid', }, { header: gettext('Votes'), @@ -291,55 +291,55 @@ Ext.define('PVE.ClusterAdministration', { width: 100, flex: 0, hidden: false, - dataIndex: 'quorum_votes' + dataIndex: 'quorum_votes', }, { header: Ext.String.format(gettext('Link {0}'), 0), dataIndex: 'ring0_addr', - linkNumber: 0 + linkNumber: 0, }, { header: Ext.String.format(gettext('Link {0}'), 1), dataIndex: 'ring1_addr', - linkNumber: 1 + linkNumber: 1, }, { header: Ext.String.format(gettext('Link {0}'), 2), dataIndex: 'ring2_addr', - linkNumber: 2 + linkNumber: 2, }, { header: Ext.String.format(gettext('Link {0}'), 3), dataIndex: 'ring3_addr', - linkNumber: 3 + linkNumber: 3, }, { header: Ext.String.format(gettext('Link {0}'), 4), dataIndex: 'ring4_addr', - linkNumber: 4 + linkNumber: 4, }, { header: Ext.String.format(gettext('Link {0}'), 5), dataIndex: 'ring5_addr', - linkNumber: 5 + linkNumber: 5, }, { header: Ext.String.format(gettext('Link {0}'), 6), dataIndex: 'ring6_addr', - linkNumber: 6 + linkNumber: 6, }, { header: Ext.String.format(gettext('Link {0}'), 7), dataIndex: 'ring7_addr', - linkNumber: 7 - } + linkNumber: 7, + }, ], defaults: { flex: 1, hidden: true, - minWidth: 150 - } - } - } - ] + minWidth: 150, + }, + }, + }, + ], }); diff --git a/www/manager6/dc/ClusterEdit.js b/www/manager6/dc/ClusterEdit.js index ee101098..124dcc90 100644 --- a/www/manager6/dc/ClusterEdit.js +++ b/www/manager6/dc/ClusterEdit.js @@ -21,7 +21,7 @@ Ext.define('PVE.ClusterCreateWindow', { fieldLabel: gettext('Cluster Name'), allowBlank: false, maxLength: 15, - name: 'clustername' + name: 'clustername', }, { xtype: 'fieldcontainer', @@ -30,11 +30,11 @@ Ext.define('PVE.ClusterCreateWindow', { { xtype: 'pveCorosyncLinkEditor', infoText: gettext("Multiple links are used as failover, lower numbers have higher priority."), - name: 'links' + name: 'links', }, - ] - }] - } + ], + }], + }, }); Ext.define('PVE.ClusterInfoWindow', { @@ -50,7 +50,7 @@ Ext.define('PVE.ClusterInfoWindow', { joinInfo: { ipAddress: undefined, fingerprint: undefined, - totem: {} + totem: {}, }, items: [ @@ -58,7 +58,7 @@ Ext.define('PVE.ClusterInfoWindow', { xtype: 'component', border: false, padding: '10 10 10 10', - html: gettext("Copy the Join Information here and use it on the node you want to add.") + html: gettext("Copy the Join Information here and use it on the node you want to add."), }, { xtype: 'container', @@ -99,11 +99,11 @@ Ext.define('PVE.ClusterInfoWindow', { var jsons = Ext.JSON.encode(field.joinInfo); var base64s = Ext.util.Base64.encode(jsons); field.setValue(base64s); - } - } - } - ] - } + }, + }, + }, + ], + }, ], dockedItems: [{ dock: 'bottom', @@ -115,9 +115,9 @@ Ext.define('PVE.ClusterInfoWindow', { el.select(); document.execCommand("copy"); }, - text: gettext('Copy Information') - }] - }] + text: gettext('Copy Information'), + }], + }], }); Ext.define('PVE.ClusterJoinNodeWindow', { @@ -145,7 +145,7 @@ Ext.define('PVE.ClusterJoinNodeWindow', { info: { fp: '', ip: '', - clusterName: '' + clusterName: '', }, hasAssistedInfo: false, }, @@ -170,18 +170,18 @@ Ext.define('PVE.ClusterJoinNodeWindow', { '#': { close: function() { delete PVE.Utils.silenceAuthFailures; - } + }, }, 'proxmoxcheckbox[name=assistedEntry]': { - change: 'onInputTypeChange' + change: 'onInputTypeChange', }, 'textarea[name=serializedinfo]': { change: 'recomputeSerializedInfo', - enable: 'resetField' + enable: 'resetField', }, 'textfield': { - disable: 'resetField' - } + disable: 'resetField', + }, }, resetField: function(field) { field.reset(); @@ -216,7 +216,7 @@ Ext.define('PVE.ClusterJoinNodeWindow', { let info = { fp: '', ip: '', - clusterName: '' + clusterName: '', }; if (!(joinInfo && joinInfo.totem)) { @@ -236,7 +236,7 @@ Ext.define('PVE.ClusterJoinNodeWindow', { number: linkNumber, value: '', text: peerLink ? Ext.String.format(gettext("peer's link address: {0}"), peerLink) : '', - allowBlank: false + allowBlank: false, }; }); @@ -253,13 +253,13 @@ Ext.define('PVE.ClusterJoinNodeWindow', { info = { ip: joinInfo.ipAddress, fp: joinInfo.fingerprint, - clusterName: joinInfo.totem.cluster_name + clusterName: joinInfo.totem.cluster_name, }; field.valid = true; vm.set('hasAssistedInfo', true); } vm.set('info', info); - } + }, }, submit: function() { @@ -282,7 +282,7 @@ Ext.define('PVE.ClusterJoinNodeWindow', { Ext.Msg.show({ title: gettext('Join Task Finished'), icon: Ext.Msg.INFO, - msg: txt + msg: txt, }); } }, @@ -296,9 +296,9 @@ Ext.define('PVE.ClusterJoinNodeWindow', { value: true, autoEl: { tag: 'div', - 'data-qtip': gettext('Select if join information should be extracted from pasted cluster information, deselect for manual entering') + 'data-qtip': gettext('Select if join information should be extracted from pasted cluster information, deselect for manual entering'), }, - boxLabel: gettext('Assisted join: Paste encoded cluster join information and enter password.') + boxLabel: gettext('Assisted join: Paste encoded cluster join information and enter password.'), }, { xtype: 'textarea', @@ -313,16 +313,16 @@ Ext.define('PVE.ClusterJoinNodeWindow', { }, bind: { disabled: '{!assistedEntry.checked}', - hidden: '{!assistedEntry.checked}' + hidden: '{!assistedEntry.checked}', }, - value: '' + value: '', }, { xtype: 'panel', width: 776, layout: { type: 'hbox', - align: 'center' + align: 'center', }, bind: { hidden: '{!showClusterFields}', @@ -338,7 +338,7 @@ Ext.define('PVE.ClusterJoinNodeWindow', { value: '{info.ip}', readOnly: '{assistedEntry.checked}', }, - name: 'hostname' + name: 'hostname', }, { xtype: 'textfield', @@ -348,9 +348,9 @@ Ext.define('PVE.ClusterJoinNodeWindow', { emptyText: gettext("Peer's root password"), fieldLabel: gettext('Password'), allowBlank: false, - name: 'password' + name: 'password', }, - ] + ], }, { xtype: 'textfield', @@ -361,7 +361,7 @@ Ext.define('PVE.ClusterJoinNodeWindow', { readOnly: '{assistedEntry.checked}', hidden: '{!showClusterFields}', }, - name: 'fingerprint' + name: 'fingerprint', }, { xtype: 'fieldcontainer', @@ -374,8 +374,8 @@ Ext.define('PVE.ClusterJoinNodeWindow', { xtype: 'pveCorosyncLinkEditor', itemId: 'linkEditor', reference: 'linkEditor', - allowNumberEdit: false + allowNumberEdit: false, }, - ] - }] + ], + }], }); diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js index f517115d..24ecabb6 100644 --- a/www/manager6/dc/Config.js +++ b/www/manager6/dc/Config.js @@ -17,7 +17,7 @@ Ext.define('PVE.dc.Config', { Ext.apply(me, { title: gettext("Datacenter"), - hstateid: 'dctab' + hstateid: 'dctab', }); if (caps.dc['Sys.Audit']) { @@ -25,25 +25,25 @@ Ext.define('PVE.dc.Config', { title: gettext('Summary'), xtype: 'pveDcSummary', iconCls: 'fa fa-book', - itemId: 'summary' + itemId: 'summary', }, { title: gettext('Cluster'), xtype: 'pveClusterAdministration', iconCls: 'fa fa-server', - itemId: 'cluster' + itemId: 'cluster', }, { title: 'Ceph', itemId: 'ceph', iconCls: 'fa fa-ceph', - xtype: 'pveNodeCephStatus' + xtype: 'pveNodeCephStatus', }, { xtype: 'pveDcOptionView', title: gettext('Options'), iconCls: 'fa fa-gear', - itemId: 'options' + itemId: 'options', }); } @@ -52,7 +52,7 @@ Ext.define('PVE.dc.Config', { xtype: 'pveStorageView', title: gettext('Storage'), iconCls: 'fa fa-database', - itemId: 'storage' + itemId: 'storage', }); } @@ -62,20 +62,20 @@ Ext.define('PVE.dc.Config', { xtype: 'pveDcBackupView', iconCls: 'fa fa-floppy-o', title: gettext('Backup'), - itemId: 'backup' + itemId: 'backup', }, { xtype: 'pveReplicaView', iconCls: 'fa fa-retweet', title: gettext('Replication'), - itemId: 'replication' + itemId: 'replication', }, { xtype: 'pveACLView', title: gettext('Permissions'), iconCls: 'fa fa-unlock', itemId: 'permissions', - expandedOnInit: true + expandedOnInit: true, }); } @@ -84,7 +84,7 @@ Ext.define('PVE.dc.Config', { groups: ['permissions'], iconCls: 'fa fa-user', title: gettext('Users'), - itemId: 'users' + itemId: 'users', }); me.items.push({ @@ -92,7 +92,7 @@ Ext.define('PVE.dc.Config', { groups: ['permissions'], iconCls: 'fa fa-user-o', title: gettext('API Tokens'), - itemId: 'apitokens' + itemId: 'apitokens', }); if (caps.dc['Sys.Audit']) { @@ -101,48 +101,48 @@ Ext.define('PVE.dc.Config', { title: gettext('Groups'), iconCls: 'fa fa-users', groups: ['permissions'], - itemId: 'groups' + itemId: 'groups', }, { xtype: 'pvePoolView', title: gettext('Pools'), iconCls: 'fa fa-tags', groups: ['permissions'], - itemId: 'pools' + itemId: 'pools', }, { xtype: 'pveRoleView', title: gettext('Roles'), iconCls: 'fa fa-male', groups: ['permissions'], - itemId: 'roles' + itemId: 'roles', }, { xtype: 'pveAuthView', title: gettext('Authentication'), groups: ['permissions'], iconCls: 'fa fa-key', - itemId: 'domains' + itemId: 'domains', }, { xtype: 'pveHAStatus', title: 'HA', iconCls: 'fa fa-heartbeat', - itemId: 'ha' + itemId: 'ha', }, { title: gettext('Groups'), groups: ['ha'], xtype: 'pveHAGroupsView', iconCls: 'fa fa-object-group', - itemId: 'ha-groups' + itemId: 'ha-groups', }, { title: gettext('Fencing'), groups: ['ha'], iconCls: 'fa fa-bolt', xtype: 'pveFencingView', - itemId: 'ha-fencing' + itemId: 'ha-fencing', }); if (PVE.SDNInfo || PVE.SDNInfo === undefined) { me.items.push({ @@ -151,7 +151,7 @@ Ext.define('PVE.dc.Config', { iconCls: 'fa fa-sdn', hidden: true, itemId: 'sdn', - expandedOnInit: true + expandedOnInit: true, }, { xtype: 'pveSDNControllerView', @@ -159,7 +159,7 @@ Ext.define('PVE.dc.Config', { title: gettext('Controllers'), hidden: true, iconCls: 'fa fa-crosshairs', - itemId: 'sdncontroller' + itemId: 'sdncontroller', }, { xtype: 'pveSDNZoneView', @@ -167,7 +167,7 @@ Ext.define('PVE.dc.Config', { title: gettext('Zones'), hidden: true, iconCls: 'fa fa-th', - itemId: 'sdnzone' + itemId: 'sdnzone', }, { xtype: 'pveSDNVnetView', @@ -175,7 +175,7 @@ Ext.define('PVE.dc.Config', { title: gettext('Vnets'), hidden: true, iconCls: 'fa fa-network-wired', - itemId: 'sdnvnet' + itemId: 'sdnvnet', }); } @@ -184,7 +184,7 @@ Ext.define('PVE.dc.Config', { xtype: 'pveACMEClusterView', title: 'ACME', iconCls: 'fa fa-certificate', - itemId: 'acme' + itemId: 'acme', }); } @@ -195,7 +195,7 @@ Ext.define('PVE.dc.Config', { base_url: '/cluster/firewall/rules', list_refs_url: '/cluster/firewall/refs', iconCls: 'fa fa-shield', - itemId: 'firewall' + itemId: 'firewall', }, { xtype: 'pveFirewallOptions', @@ -205,14 +205,14 @@ Ext.define('PVE.dc.Config', { base_url: '/cluster/firewall/options', onlineHelp: 'pve_firewall_cluster_wide_setup', fwtype: 'dc', - itemId: 'firewall-options' + itemId: 'firewall-options', }, { xtype: 'pveSecurityGroups', title: gettext('Security Group'), groups: ['firewall'], iconCls: 'fa fa-group', - itemId: 'firewall-sg' + itemId: 'firewall-sg', }, { xtype: 'pveFirewallAliases', @@ -220,7 +220,7 @@ Ext.define('PVE.dc.Config', { groups: ['firewall'], iconCls: 'fa fa-external-link', base_url: '/cluster/firewall/aliases', - itemId: 'firewall-aliases' + itemId: 'firewall-aliases', }, { xtype: 'pveIPSet', @@ -229,7 +229,7 @@ Ext.define('PVE.dc.Config', { iconCls: 'fa fa-list-ol', base_url: '/cluster/firewall/ipset', list_refs_url: '/cluster/firewall/refs', - itemId: 'firewall-ipset' + itemId: 'firewall-ipset', }, { xtype: 'pveMetricServerView', @@ -242,10 +242,10 @@ Ext.define('PVE.dc.Config', { xtype: 'pveDcSupport', title: gettext('Support'), itemId: 'support', - iconCls: 'fa fa-comments-o' + iconCls: 'fa fa-comments-o', }); } me.callParent(); - } + }, }); diff --git a/www/manager6/dc/CorosyncLinkEdit.js b/www/manager6/dc/CorosyncLinkEdit.js index bce6f4cc..86b9954a 100644 --- a/www/manager6/dc/CorosyncLinkEdit.js +++ b/www/manager6/dc/CorosyncLinkEdit.js @@ -56,7 +56,7 @@ Ext.define('PVE.form.CorosyncLinkEditorController', { view.remove(this); me.updateDeleteButtonState(); - } + }, }); view.add(linkSelector); @@ -115,7 +115,7 @@ Ext.define('PVE.form.CorosyncLinkEditorController', { // all numbers in use, this should never happen since add button is // disabled automatically return 0; - } + }, }); Ext.define('PVE.form.CorosyncLinkSelector', { @@ -147,7 +147,7 @@ Ext.define('PVE.form.CorosyncLinkSelector', { fieldLabel: 'Link', cbind: { hidden: '{allowNumberEdit}', - value: '{initNumber}' + value: '{initNumber}', }, width: 45, labelWidth: 30, @@ -159,7 +159,7 @@ Ext.define('PVE.form.CorosyncLinkSelector', { cbind: { maxValue: '{maxLinkNumber}', hidden: '{!allowNumberEdit}', - value: '{initNumber}' + value: '{initNumber}', }, width: 80, labelWidth: 30, @@ -187,14 +187,14 @@ Ext.define('PVE.form.CorosyncLinkSelector', { let linkNumber = numSelect.getValue(); me.name = 'link' + linkNumber; return me.getValue(); - } + }, }, { xtype: 'button', iconCls: 'fa fa-trash-o', cls: 'removeLinkBtn', cbind: { - hidden: '{!allowNumberEdit}' + hidden: '{!allowNumberEdit}', }, handler: function() { let me = this; @@ -202,7 +202,7 @@ Ext.define('PVE.form.CorosyncLinkSelector', { if (parent.removeBtnHandler !== undefined) { parent.removeBtnHandler(); } - } + }, }, { xtype: 'label', @@ -212,9 +212,9 @@ Ext.define('PVE.form.CorosyncLinkSelector', { cls: 'x-form-item-label-default', cbind: { - text: '{text}' - } - } + text: '{text}', + }, + }, ], initComponent: function() { @@ -227,12 +227,12 @@ Ext.define('PVE.form.CorosyncLinkSelector', { numSelect.validator = this.createNoDuplicatesValidator( 'numberfield', - gettext("Duplicate link number not allowed.") + gettext("Duplicate link number not allowed."), ); netSelect.validator = this.createNoDuplicatesValidator( 'proxmoxNetworkSelector', - gettext("Duplicate link address not allowed.") + gettext("Duplicate link address not allowed."), ); }, @@ -278,7 +278,7 @@ Ext.define('PVE.form.CorosyncLinkSelector', { return err || true; }; - } + }, }); Ext.define('PVE.form.CorosyncLinkEditor', { @@ -296,7 +296,7 @@ Ext.define('PVE.form.CorosyncLinkEditor', { maxLinkCount: 8, networks: null, allowNumberEdit: true, - infoText: '' + infoText: '', }, formulas: { addDisabled: function(get) { @@ -305,8 +305,8 @@ Ext.define('PVE.form.CorosyncLinkEditor', { }, dockHidden: function(get) { return !(get('allowNumberEdit') || get('infoText')); - } - } + }, + }, }, dockedItems: [{ @@ -316,7 +316,7 @@ Ext.define('PVE.form.CorosyncLinkEditor', { border: false, padding: '6 0 6 0', bind: { - hidden: '{dockHidden}' + hidden: '{dockHidden}', }, items: [ { @@ -324,17 +324,17 @@ Ext.define('PVE.form.CorosyncLinkEditor', { text: gettext('Add'), bind: { disabled: '{addDisabled}', - hidden: '{!allowNumberEdit}' + hidden: '{!allowNumberEdit}', }, - handler: 'addEmptyLink' + handler: 'addEmptyLink', }, { xtype: 'label', bind: { - text: '{infoText}' - } - } - ] + text: '{infoText}', + }, + }, + ], }], setInfoText: function(text) { @@ -382,7 +382,7 @@ Ext.define('PVE.form.CorosyncLinkEditor', { let me = this; let vm = me.up('pveCorosyncLinkEditor').getViewModel(); return vm.get('linkCount') > 0; - } + }, }], initComponent: function() { @@ -429,8 +429,8 @@ Ext.define('PVE.form.CorosyncLinkEditor', { if (vm.get('allowNumberEdit')) { controller.addLinkIfEmpty(); } - } + }, }); - } + }, }); diff --git a/www/manager6/dc/GroupEdit.js b/www/manager6/dc/GroupEdit.js index 9ee338e7..0d4944cb 100644 --- a/www/manager6/dc/GroupEdit.js +++ b/www/manager6/dc/GroupEdit.js @@ -28,15 +28,15 @@ Ext.define('PVE.dc.GroupEdit', { fieldLabel: gettext('Name'), name: 'groupid', value: me.groupid, - allowBlank: false + allowBlank: false, }, { xtype: 'textfield', fieldLabel: gettext('Comment'), name: 'comment', - allowBlank: true - } - ] + allowBlank: true, + }, + ], }); me.callParent(); @@ -44,5 +44,5 @@ Ext.define('PVE.dc.GroupEdit', { if (!me.isCreate) { me.load(); } - } + }, }); diff --git a/www/manager6/dc/GroupView.js b/www/manager6/dc/GroupView.js index 0df36362..9f1ebecd 100644 --- a/www/manager6/dc/GroupView.js +++ b/www/manager6/dc/GroupView.js @@ -15,8 +15,8 @@ Ext.define('PVE.dc.GroupView', { model: 'pve-groups', sorters: { property: 'groupid', - order: 'DESC' - } + order: 'DESC', + }, }); var reload = function() { @@ -30,7 +30,7 @@ Ext.define('PVE.dc.GroupView', { callback: function() { reload(); }, - baseurl: '/access/groups/' + baseurl: '/access/groups/', }); var run_editor = function() { @@ -39,8 +39,8 @@ Ext.define('PVE.dc.GroupView', { return; } - var win = Ext.create('PVE.dc.GroupEdit',{ - groupid: rec.data.groupid + var win = Ext.create('PVE.dc.GroupEdit', { + groupid: rec.data.groupid, }); win.on('destroy', reload); win.show(); @@ -50,7 +50,7 @@ Ext.define('PVE.dc.GroupView', { text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); var tbar = [ @@ -60,9 +60,9 @@ Ext.define('PVE.dc.GroupView', { var win = Ext.create('PVE.dc.GroupEdit', {}); win.on('destroy', reload); win.show(); - } + }, }, - edit_btn, remove_btn + edit_btn, remove_btn, ]; Proxmox.Utils.monStoreErrors(me, store); @@ -72,36 +72,36 @@ Ext.define('PVE.dc.GroupView', { selModel: sm, tbar: tbar, viewConfig: { - trackOver: false + trackOver: false, }, columns: [ { header: gettext('Name'), width: 200, sortable: true, - dataIndex: 'groupid' + dataIndex: 'groupid', }, { header: gettext('Comment'), sortable: false, renderer: Ext.String.htmlEncode, dataIndex: 'comment', - flex: 1 + flex: 1, }, { header: gettext('Users'), sortable: false, dataIndex: 'users', renderer: Ext.String.htmlEncode, - flex: 1 - } + flex: 1, + }, ], listeners: { activate: reload, - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/dc/Guests.js b/www/manager6/dc/Guests.js index efa4c73e..e8bcc52b 100644 --- a/www/manager6/dc/Guests.js +++ b/www/manager6/dc/Guests.js @@ -10,9 +10,9 @@ Ext.define('PVE.dc.Guests', { columns: 2, tableAttrs: { style: { - width: '100%' - } - } + width: '100%', + }, + }, }, bodyPadding: '0 20 20 20', @@ -21,8 +21,8 @@ Ext.define('PVE.dc.Guests', { padding: '0 50 0 50', style: { 'text-align':'center', - 'line-height':'1.2' - } + 'line-height':'1.2', + }, }, items: [{ itemId: 'qemu', @@ -30,7 +30,7 @@ Ext.define('PVE.dc.Guests', { running: 0, paused: 0, stopped: 0, - template: 0 + template: 0, }, tpl: [ '

' + gettext("Virtual Machines") + '

', @@ -57,15 +57,15 @@ Ext.define('PVE.dc.Guests', { gettext('Templates'), '', '
{template}
', - '' - ] - },{ + '', + ], + }, { itemId: 'lxc', data: { running: 0, paused: 0, stopped: 0, - template: 0 + template: 0, }, tpl: [ '

' + gettext("LXC Container") + '

', @@ -92,13 +92,13 @@ Ext.define('PVE.dc.Guests', { gettext('Templates'), '', '
{template}
', - '' - ] - },{ + '', + ], + }, { itemId: 'error', colspan: 2, data: { - num: 0 + num: 0, }, columnWidth: 1, padding: '10 250 0 250', @@ -109,8 +109,8 @@ Ext.define('PVE.dc.Guests', { gettext('Error'), '', '
{num}
', - '' - ] + '', + ], }], updateValues: function(qemu, lxc, error) { @@ -118,5 +118,5 @@ Ext.define('PVE.dc.Guests', { me.getComponent('qemu').update(qemu); me.getComponent('lxc').update(lxc); me.getComponent('error').update({num: error}); - } + }, }); diff --git a/www/manager6/dc/Health.js b/www/manager6/dc/Health.js index 66257d81..e6234a6c 100644 --- a/www/manager6/dc/Health.js +++ b/www/manager6/dc/Health.js @@ -8,15 +8,15 @@ Ext.define('PVE.dc.Health', { height: 250, layout: { type: 'hbox', - align: 'stretch' + align: 'stretch', }, defaults: { flex: 1, xtype: 'box', style: { - 'text-align':'center' - } + 'text-align':'center', + }, }, nodeList: [], @@ -30,12 +30,12 @@ Ext.define('PVE.dc.Health', { var cluster = { iconCls: PVE.Utils.get_health_icon('good', true), - text: gettext("Standalone node - no cluster defined") + text: gettext("Standalone node - no cluster defined"), }; var nodes = { online: 0, - offline: 0 + offline: 0, }; // by default we have one node @@ -98,20 +98,20 @@ Ext.define('PVE.dc.Health', { destroy: function() { var me = this; me.cephstore.stopUpdate(); - } + }, }, items: [ { itemId: 'clusterstatus', xtype: 'pveHealthWidget', - title: gettext('Status') + title: gettext('Status'), }, { itemId: 'nodestatus', data: { online: 0, - offline: 0 + offline: 0, }, tpl: [ '

' + gettext('Nodes') + '


', @@ -127,8 +127,8 @@ Ext.define('PVE.dc.Health', { gettext('Offline'), '', '
{offline}
', - '' - ] + '', + ], }, { itemId: 'ceph', @@ -143,9 +143,9 @@ Ext.define('PVE.dc.Health', { click: function() { var sp = Ext.state.Manager.getProvider(); sp.set('dctab', {value:'ceph'}, true); - } - } - } + }, + }, + }, ], initComponent: function() { @@ -158,11 +158,11 @@ Ext.define('PVE.dc.Health', { storeid: 'pve-cluster-ceph', proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodeList[me.nodeIndex].node + '/ceph/status' - } + url: '/api2/json/nodes/' + me.nodeList[me.nodeIndex].node + '/ceph/status', + }, }); me.callParent(); me.mon(me.cephstore, 'load', me.updateCeph, me); me.cephstore.startUpdate(); - } + }, }); diff --git a/www/manager6/dc/Log.js b/www/manager6/dc/Log.js index 7eb691bf..6f7ce4f7 100644 --- a/www/manager6/dc/Log.js +++ b/www/manager6/dc/Log.js @@ -15,13 +15,13 @@ Ext.define('PVE.dc.Log', { model: 'proxmox-cluster-log', proxy: { type: 'proxmox', - url: '/api2/json/cluster/log' - } + url: '/api2/json/cluster/log', + }, }); var store = Ext.create('Proxmox.data.DiffStore', { rstore: logstore, - appendAtStart: true + appendAtStart: true, }); Ext.apply(me, { @@ -38,7 +38,7 @@ Ext.define('PVE.dc.Log', { if (pri && pri <= 3) { return "proxmox-invalid-row"; } - } + }, }, sortableColumns: false, columns: [ @@ -48,49 +48,49 @@ Ext.define('PVE.dc.Log', { width: 150, renderer: function(value) { return Ext.Date.format(value, "M d H:i:s"); - } + }, }, { header: gettext("Node"), dataIndex: 'node', - width: 150 + width: 150, }, { header: gettext("Service"), dataIndex: 'tag', - width: 100 + width: 100, }, { header: "PID", dataIndex: 'pid', - width: 100 + width: 100, }, { header: gettext("User name"), dataIndex: 'user', renderer: Ext.String.htmlEncode, - width: 150 + width: 150, }, { header: gettext("Severity"), dataIndex: 'pri', renderer: PVE.Utils.render_serverity, - width: 100 + width: 100, }, { header: gettext("Message"), dataIndex: 'msg', renderer: Ext.String.htmlEncode, - flex: 1 - } + flex: 1, + }, ], listeners: { activate: () => logstore.startUpdate(), deactivate: () => logstore.stopUpdate(), destroy: () => logstore.stopUpdate(), - } + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/dc/NodeView.js b/www/manager6/dc/NodeView.js index 81b17b9a..1adc2d69 100644 --- a/www/manager6/dc/NodeView.js +++ b/www/manager6/dc/NodeView.js @@ -11,13 +11,13 @@ Ext.define('PVE.dc.NodeView', { header: gettext('Name'), flex: 1, sortable: true, - dataIndex: 'name' + dataIndex: 'name', }, { header: 'ID', width: 40, sortable: true, - dataIndex: 'nodeid' + dataIndex: 'nodeid', }, { header: gettext('Online'), @@ -27,20 +27,20 @@ Ext.define('PVE.dc.NodeView', { renderer: function(value) { var cls = (value)?'good':'critical'; return ''; - } + }, }, { header: gettext('Support'), width: 100, sortable: true, dataIndex: 'level', - renderer: PVE.Utils.render_support_level + renderer: PVE.Utils.render_support_level, }, { header: gettext('Server Address'), width: 115, sortable: true, - dataIndex: 'ip' + dataIndex: 'ip', }, { header: gettext('CPU usage'), @@ -50,8 +50,8 @@ Ext.define('PVE.dc.NodeView', { tdCls: 'x-progressbar-default-cell', xtype: 'widgetcolumn', widget: { - xtype: 'pveProgressBar' - } + xtype: 'pveProgressBar', + }, }, { header: gettext('Memory usage'), @@ -61,16 +61,16 @@ Ext.define('PVE.dc.NodeView', { dataIndex: 'memoryusage', xtype: 'widgetcolumn', widget: { - xtype: 'pveProgressBar' - } + xtype: 'pveProgressBar', + }, }, { header: gettext('Uptime'), sortable: true, dataIndex: 'uptime', align: 'right', - renderer: Proxmox.Utils.render_uptime - } + renderer: Proxmox.Utils.render_uptime, + }, ], stateful: true, @@ -82,7 +82,7 @@ Ext.define('PVE.dc.NodeView', { var me = this.up('grid'); var height = Math.max(me.getHeight()-50, 250); me.setHeight(height); - } + }, }, { type: 'down', @@ -90,26 +90,26 @@ Ext.define('PVE.dc.NodeView', { var me = this.up('grid'); var height = me.getHeight()+50; me.setHeight(height); - } - } - ] + }, + }, + ], }, function() { Ext.define('pve-dc-nodes', { extend: 'Ext.data.Model', fields: [ 'id', 'type', 'name', 'nodeid', 'ip', 'level', 'local', 'online'], - idProperty: 'id' + idProperty: 'id', }); }); -Ext.define('PVE.widget.ProgressBar',{ +Ext.define('PVE.widget.ProgressBar', { extend: 'Ext.Progress', alias: 'widget.pveProgressBar', animate: true, textTpl: [ - '{percent}%' + '{percent}%', ], setValue: function(value){ @@ -123,5 +123,5 @@ Ext.define('PVE.widget.ProgressBar',{ } else if (value > 0.59) { me.addCls('warning'); } - } + }, }); diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index 632ae72c..2893b901 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -24,7 +24,7 @@ Ext.define('PVE.dc.OptionView', { subject: text, onlineHelp: opts.onlineHelp, fieldDefaults: { - labelWidth: opts.labelWidth || 100 + labelWidth: opts.labelWidth || 100, }, setValues: function(values) { var edit_value = values[name]; @@ -48,9 +48,9 @@ Ext.define('PVE.dc.OptionView', { ret_val[name] = PVE.Parser.printPropertyString(values); return ret_val; }, - items: opts.items - }] - } : undefined + items: opts.items, + }], + } : undefined, }; }, @@ -74,28 +74,28 @@ Ext.define('PVE.dc.OptionView', { renderer: PVE.Utils.render_kvm_language, comboItems: PVE.Utils.kvm_keymap_array(), defaultValue: '__default__', - deleteEmpty: true + deleteEmpty: true, }); me.add_text_row('http_proxy', gettext('HTTP proxy'), { defaultValue: Proxmox.Utils.noneText, vtype: 'HttpProxy', - deleteEmpty: true + deleteEmpty: true, }); me.add_combobox_row('console', gettext('Console Viewer'), { renderer: PVE.Utils.render_console_viewer, comboItems: PVE.Utils.console_viewer_array(), defaultValue: '__default__', - deleteEmpty: true + deleteEmpty: true, }); me.add_text_row('email_from', gettext('Email from address'), { deleteEmpty: true, vtype: 'proxmoxMail', - defaultValue: 'root@$hostname' + defaultValue: 'root@$hostname', }); me.add_text_row('mac_prefix', gettext('MAC address prefix'), { deleteEmpty: true, vtype: 'MacPrefix', - defaultValue: Proxmox.Utils.noneText + defaultValue: Proxmox.Utils.noneText, }); me.add_inputpanel_row('migration', gettext('Migration Settings'), { renderer: PVE.Utils.render_dc_ha_opts, @@ -115,8 +115,8 @@ Ext.define('PVE.dc.OptionView', { value: null, emptyText: Proxmox.Utils.defaultText, autoSelect: false, - skipEmptyText: true - }] + skipEmptyText: true, + }], }); me.add_inputpanel_row('ha', gettext('HA Settings'), { renderer: PVE.Utils.render_dc_ha_opts, @@ -134,10 +134,10 @@ Ext.define('PVE.dc.OptionView', { ['freeze', 'freeze'], ['failover', 'failover'], ['migrate', 'migrate'], - ['conditional', 'conditional'] + ['conditional', 'conditional'], ], - defaultValue: '__default__' - }] + defaultValue: '__default__', + }], }); me.add_inputpanel_row('u2f', gettext('U2F Settings'), { renderer: PVE.Utils.render_dc_ha_opts, @@ -168,7 +168,7 @@ Ext.define('PVE.dc.OptionView', { xtype: 'displayfield', userCls: 'pmx-hint', value: gettext('NOTE: Changing an AppID breaks existing U2F registrations!'), - }] + }], }); me.add_inputpanel_row('bwlimit', gettext('Bandwidth Limits'), { renderer: me.render_bwlimits, @@ -210,7 +210,7 @@ Ext.define('PVE.dc.OptionView', { fieldLabel: gettext('Disk Move'), emptyText: gettext('default'), backendUnit: "KiB", - }] + }], }); me.add_integer_row('max_workers', gettext('Maximal Workers/bulk-action'), { deleteEmpty: true, @@ -227,17 +227,17 @@ Ext.define('PVE.dc.OptionView', { xtype: 'proxmoxButton', disabled: true, handler: function() { me.run_editor(); }, - selModel: me.selModel + selModel: me.selModel, }], url: "/api2/json/cluster/options", editorConfig: { - url: "/api2/extjs/cluster/options" + url: "/api2/extjs/cluster/options", }, interval: 5000, cwidth1: 200, listeners: { - itemdblclick: me.run_editor - } + itemdblclick: me.run_editor, + }, }); me.callParent(); @@ -258,5 +258,5 @@ Ext.define('PVE.dc.OptionView', { me.on('activate', me.rstore.startUpdate); me.on('destroy', me.rstore.stopUpdate); me.on('deactivate', me.rstore.stopUpdate); - } + }, }); diff --git a/www/manager6/dc/PoolView.js b/www/manager6/dc/PoolView.js index 5ffe277a..ea42f343 100644 --- a/www/manager6/dc/PoolView.js +++ b/www/manager6/dc/PoolView.js @@ -15,8 +15,8 @@ Ext.define('PVE.dc.PoolView', { model: 'pve-pools', sorters: { property: 'poolid', - order: 'DESC' - } + order: 'DESC', + }, }); var reload = function() { @@ -30,7 +30,7 @@ Ext.define('PVE.dc.PoolView', { baseurl: '/pools/', callback: function () { reload(); - } + }, }); var run_editor = function() { @@ -39,8 +39,8 @@ Ext.define('PVE.dc.PoolView', { return; } - var win = Ext.create('PVE.dc.PoolEdit',{ - poolid: rec.data.poolid + var win = Ext.create('PVE.dc.PoolEdit', { + poolid: rec.data.poolid, }); win.on('destroy', reload); win.show(); @@ -50,7 +50,7 @@ Ext.define('PVE.dc.PoolView', { text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); var tbar = [ @@ -60,9 +60,9 @@ Ext.define('PVE.dc.PoolView', { var win = Ext.create('PVE.dc.PoolEdit', {}); win.on('destroy', reload); win.show(); - } + }, }, - edit_btn, remove_btn + edit_btn, remove_btn, ]; Proxmox.Utils.monStoreErrors(me, store); @@ -72,29 +72,29 @@ Ext.define('PVE.dc.PoolView', { selModel: sm, tbar: tbar, viewConfig: { - trackOver: false + trackOver: false, }, columns: [ { header: gettext('Name'), width: 200, sortable: true, - dataIndex: 'poolid' + dataIndex: 'poolid', }, { header: gettext('Comment'), sortable: false, renderer: Ext.String.htmlEncode, dataIndex: 'comment', - flex: 1 - } + flex: 1, + }, ], listeners: { activate: reload, - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/dc/RoleEdit.js b/www/manager6/dc/RoleEdit.js index 7f6e5adc..2770a93f 100644 --- a/www/manager6/dc/RoleEdit.js +++ b/www/manager6/dc/RoleEdit.js @@ -30,16 +30,16 @@ Ext.define('PVE.dc.RoleEdit', { name: 'roleid', value: me.roleid, allowBlank: false, - fieldLabel: gettext('Name') + fieldLabel: gettext('Name'), }, { xtype: 'pvePrivilegesSelector', name: 'privs', value: me.privs, allowBlank: false, - fieldLabel: gettext('Privileges') - } - ] + fieldLabel: gettext('Privileges'), + }, + ], }); me.callParent(); @@ -52,10 +52,10 @@ Ext.define('PVE.dc.RoleEdit', { me.setValues({ privs: keys, - roleid: me.roleid + roleid: me.roleid, }); - } + }, }); } - } + }, }); diff --git a/www/manager6/dc/RoleView.js b/www/manager6/dc/RoleView.js index 3a25da80..858ebc13 100644 --- a/www/manager6/dc/RoleView.js +++ b/www/manager6/dc/RoleView.js @@ -15,8 +15,8 @@ Ext.define('PVE.dc.RoleView', { model: 'pmx-roles', sorters: { property: 'roleid', - order: 'DESC' - } + order: 'DESC', + }, }); var render_privs = function(value, metaData) { @@ -49,9 +49,9 @@ Ext.define('PVE.dc.RoleView', { return; } - var win = Ext.create('PVE.dc.RoleEdit',{ + var win = Ext.create('PVE.dc.RoleEdit', { roleid: rec.data.roleid, - privs: rec.data.privs + privs: rec.data.privs, }); win.on('destroy', reload); win.show(); @@ -62,7 +62,7 @@ Ext.define('PVE.dc.RoleView', { selModel: sm, viewConfig: { - trackOver: false + trackOver: false, }, columns: [ { @@ -70,13 +70,13 @@ Ext.define('PVE.dc.RoleView', { width: 65, sortable: true, dataIndex: 'special', - renderer: Proxmox.Utils.format_boolean + renderer: Proxmox.Utils.format_boolean, }, { header: gettext('Name'), width: 150, sortable: true, - dataIndex: 'roleid' + dataIndex: 'roleid', }, { itemid: 'privs', @@ -84,14 +84,14 @@ Ext.define('PVE.dc.RoleView', { sortable: false, renderer: render_privs, dataIndex: 'privs', - flex: 1 - } + flex: 1, + }, ], listeners: { activate: function() { store.load(); }, - itemdblclick: run_editor + itemdblclick: run_editor, }, tbar: [ { @@ -100,7 +100,7 @@ Ext.define('PVE.dc.RoleView', { var win = Ext.create('PVE.dc.RoleEdit', {}); win.on('destroy', reload); win.show(); - } + }, }, { xtype: 'proxmoxButton', @@ -118,10 +118,10 @@ Ext.define('PVE.dc.RoleView', { }, baseurl: '/access/roles/', enableFn: (rec) => !rec.data.special, - } - ] + }, + ], }); me.callParent(); - } + }, }); diff --git a/www/manager6/dc/SecurityGroups.js b/www/manager6/dc/SecurityGroups.js index 016462bb..e0a91a18 100644 --- a/www/manager6/dc/SecurityGroups.js +++ b/www/manager6/dc/SecurityGroups.js @@ -2,7 +2,7 @@ Ext.define('pve-security-groups', { extend: 'Ext.data.Model', fields: [ 'group', 'comment', 'digest' ], - idProperty: 'group' + idProperty: 'group', }); Ext.define('PVE.SecurityGroupEdit', { @@ -28,14 +28,14 @@ Ext.define('PVE.SecurityGroupEdit', { name: 'group', value: me.group_name || '', fieldLabel: gettext('Name'), - allowBlank: false + allowBlank: false, }, { xtype: 'textfield', name: 'comment', value: me.group_comment || '', - fieldLabel: gettext('Comment') - } + fieldLabel: gettext('Comment'), + }, ]; if (me.isCreate) { @@ -45,24 +45,24 @@ Ext.define('PVE.SecurityGroupEdit', { items.push({ xtype: 'hiddenfield', name: 'rename', - value: me.group_name + value: me.group_name, }); } var ipanel = Ext.create('Proxmox.panel.InputPanel', { // InputPanel does not have a 'create' property, does it need a 'isCreate' isCreate: me.isCreate, - items: items + items: items, }); Ext.apply(me, { subject: subject, - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); - } + }, }); Ext.define('PVE.SecurityGroupList', { @@ -95,12 +95,12 @@ Ext.define('PVE.SecurityGroupList', { model: 'pve-security-groups', proxy: { type: 'proxmox', - url: '/api2/json' + me.base_url + url: '/api2/json' + me.base_url, }, sorters: { property: 'group', - order: 'DESC' - } + order: 'DESC', + }, }); var sm = Ext.create('Ext.selection.RowModel', {}); @@ -125,7 +125,7 @@ Ext.define('PVE.SecurityGroupList', { var win = Ext.create('PVE.SecurityGroupEdit', { digest: rec.data.digest, group_name: rec.data.group, - group_comment: rec.data.comment + group_comment: rec.data.comment, }); win.show(); win.on('destroy', reload); @@ -135,7 +135,7 @@ Ext.define('PVE.SecurityGroupList', { text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); me.addBtn = new Proxmox.button.Button({ @@ -145,7 +145,7 @@ Ext.define('PVE.SecurityGroupList', { var win = Ext.create('PVE.SecurityGroupEdit', {}); win.show(); win.on('destroy', reload); - } + }, }); me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', { @@ -156,7 +156,7 @@ Ext.define('PVE.SecurityGroupList', { }, callback: function() { reload(); - } + }, }); Ext.apply(me, { @@ -165,7 +165,7 @@ Ext.define('PVE.SecurityGroupList', { selModel: sm, columns: [ { header: gettext('Group'), dataIndex: 'group', width: '100' }, - { header: gettext('Comment'), dataIndex: 'comment', renderer: Ext.String.htmlEncode, flex: 1 } + { header: gettext('Comment'), dataIndex: 'comment', renderer: Ext.String.htmlEncode, flex: 1 }, ], listeners: { itemdblclick: run_editor, @@ -176,14 +176,14 @@ Ext.define('PVE.SecurityGroupList', { deselect: function() { me.rule_panel.setBaseUrl(undefined); }, - show: reload - } + show: reload, + }, }); me.callParent(); store.load(); - } + }, }); Ext.define('PVE.SecurityGroups', { @@ -200,7 +200,7 @@ Ext.define('PVE.SecurityGroups', { allow_groups: false, list_refs_url: '/cluster/firewall/refs', tbar_prefix: '' + gettext('Rules') + ':', - border: false + border: false, }); var sglist = Ext.createWidget('pveSecurityGroupList', { @@ -208,7 +208,7 @@ Ext.define('PVE.SecurityGroups', { rule_panel: rule_panel, width: '25%', border: false, - split: true + split: true, }); @@ -218,10 +218,10 @@ Ext.define('PVE.SecurityGroups', { listeners: { show: function() { sglist.fireEvent('show', sglist); - } - } + }, + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/dc/StorageView.js b/www/manager6/dc/StorageView.js index 74deb442..d2026985 100644 --- a/www/manager6/dc/StorageView.js +++ b/www/manager6/dc/StorageView.js @@ -21,8 +21,8 @@ Ext.define('PVE.dc.StorageView', { canDoBackups: schema.backups, autoShow: true, listeners: { - destroy: this.reloadStore - } + destroy: this.reloadStore, + }, }); }, @@ -33,12 +33,12 @@ Ext.define('PVE.dc.StorageView', { model: 'pve-storage', proxy: { type: 'proxmox', - url: "/api2/json/storage" + url: "/api2/json/storage", }, sorters: { property: 'storage', - order: 'DESC' - } + order: 'DESC', + }, }); var reload = function() { @@ -62,13 +62,13 @@ Ext.define('PVE.dc.StorageView', { text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); var remove_btn = Ext.create('Proxmox.button.StdRemoveButton', { selModel: sm, baseurl: '/storage/', - callback: reload + callback: reload, }); // else we cannot dynamically generate the add menu handlers @@ -84,7 +84,7 @@ Ext.define('PVE.dc.StorageView', { addMenuItems.push({ text: PVE.Utils.format_storage_type(type), iconCls: 'fa fa-fw fa-' + storage.faIcon, - handler: addHandleGenerator(type) + handler: addHandleGenerator(type), }); } @@ -93,38 +93,38 @@ Ext.define('PVE.dc.StorageView', { reloadStore: reload, selModel: sm, viewConfig: { - trackOver: false + trackOver: false, }, tbar: [ { text: gettext('Add'), menu: new Ext.menu.Menu({ - items: addMenuItems - }) + items: addMenuItems, + }), }, remove_btn, - edit_btn + edit_btn, ], columns: [ { header: 'ID', flex: 2, sortable: true, - dataIndex: 'storage' + dataIndex: 'storage', }, { header: gettext('Type'), flex: 1, sortable: true, dataIndex: 'type', - renderer: PVE.Utils.format_storage_type + renderer: PVE.Utils.format_storage_type, }, { header: gettext('Content'), flex: 3, sortable: true, dataIndex: 'content', - renderer: PVE.Utils.format_content_types + renderer: PVE.Utils.format_content_types, }, { header: gettext('Path') + '/' + gettext('Target'), @@ -136,37 +136,37 @@ Ext.define('PVE.dc.StorageView', { return record.data.target; } return value; - } + }, }, { header: gettext('Shared'), flex: 1, sortable: true, dataIndex: 'shared', - renderer: Proxmox.Utils.format_boolean + renderer: Proxmox.Utils.format_boolean, }, { header: gettext('Enabled'), flex: 1, sortable: true, dataIndex: 'disable', - renderer: Proxmox.Utils.format_neg_boolean + renderer: Proxmox.Utils.format_neg_boolean, }, { header: gettext('Bandwidth Limit'), flex: 2, sortable: true, - dataIndex: 'bwlimit' - } + dataIndex: 'bwlimit', + }, ], listeners: { activate: reload, - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }); me.callParent(); - } + }, }, function() { Ext.define('pve-storage', { @@ -174,9 +174,9 @@ Ext.define('PVE.dc.StorageView', { fields: [ 'path', 'type', 'content', 'server', 'portal', 'target', 'export', 'storage', { name: 'shared', type: 'boolean'}, - { name: 'disable', type: 'boolean'} + { name: 'disable', type: 'boolean'}, ], - idProperty: 'storage' + idProperty: 'storage', }); }); diff --git a/www/manager6/dc/Summary.js b/www/manager6/dc/Summary.js index 3e876244..b01f05ba 100644 --- a/www/manager6/dc/Summary.js +++ b/www/manager6/dc/Summary.js @@ -30,27 +30,27 @@ Ext.define('PVE.dc.Summary', { layout: 'hbox', defaults: { xtype: 'proxmoxGauge', - flex: 1 + flex: 1, }, items:[ { title: gettext('CPU'), - itemId: 'cpu' + itemId: 'cpu', }, { title: gettext('Memory'), - itemId: 'memory' + itemId: 'memory', }, { title: gettext('Storage'), - itemId: 'storage' - } - ] + itemId: 'storage', + }, + ], }, { itemId: 'nodeview', xtype: 'pveDcNodeView', - height: 250 + height: 250, }, { title: gettext('Subscriptions'), @@ -66,11 +66,11 @@ Ext.define('PVE.dc.Summary', { if (this.component.userCls === 'pointer') { window.open('https://www.proxmox.com/en/proxmox-ve/pricing', '_blank'); } - } - } - } - ] - } + }, + }, + }, + ], + }, ], listeners: { @@ -88,20 +88,20 @@ Ext.define('PVE.dc.Summary', { model: 'pve-dc-nodes', proxy: { type: 'proxmox', - url: "/api2/json/cluster/status" - } + url: "/api2/json/cluster/status", + }, }); var gridstore = Ext.create('Proxmox.data.DiffStore', { rstore: rstore, filters: { property: 'type', - value: 'node' + value: 'node', }, sorters: { property: 'id', - direction: 'ASC' - } + direction: 'ASC', + }, }); me.callParent(); @@ -141,13 +141,13 @@ Ext.define('PVE.dc.Summary', { running: 0, paused: 0, stopped: 0, - template: 0 + template: 0, }; var lxc = { running: 0, paused: 0, stopped: 0, - template: 0 + template: 0, }; var error = 0; @@ -215,7 +215,7 @@ Ext.define('PVE.dc.Summary', { text = Ext.String.format(gettext('{0} of {1}'), PVE.Utils.render_size(used), PVE.Utils.render_size(total)); storagestat.updateValue((used/total), text); - gueststatus.updateValues(qemu,lxc,error); + gueststatus.updateValues(qemu, lxc, error); me.suspendLayout = false; me.updateLayout(true); @@ -255,27 +255,27 @@ Ext.define('PVE.dc.Summary', { var data = { title: Proxmox.Utils.unknownText, text: Proxmox.Utils.unknownText, - iconCls: PVE.Utils.get_health_icon(undefined, true) + iconCls: PVE.Utils.get_health_icon(undefined, true), }; if (level === '') { data = { title: gettext('No Subscription'), iconCls: PVE.Utils.get_health_icon('critical', true), - text: gettext('You have at least one node without subscription.') + text: gettext('You have at least one node without subscription.'), }; subs.setUserCls('pointer'); } else if (mixed) { data = { title: gettext('Mixed Subscriptions'), iconCls: PVE.Utils.get_health_icon('warning', true), - text: gettext('Warning: Your subscription levels are not the same.') + text: gettext('Warning: Your subscription levels are not the same.'), }; subs.setUserCls('pointer'); } else if (level) { data = { title: PVE.Utils.render_support_level(level), iconCls: PVE.Utils.get_health_icon('good', true), - text: gettext('Your subscription status is valid.') + text: gettext('Your subscription status is valid.'), }; subs.setUserCls(''); } @@ -295,6 +295,6 @@ Ext.define('PVE.dc.Summary', { }); rstore.startUpdate(); - } + }, }); diff --git a/www/manager6/dc/Support.js b/www/manager6/dc/Support.js index d1dcc0dd..1b0e3eac 100644 --- a/www/manager6/dc/Support.js +++ b/www/manager6/dc/Support.js @@ -71,7 +71,7 @@ Ext.define('PVE.dc.Support', { } else { me.updateInactive(data); } - } + }, }); }; @@ -79,10 +79,10 @@ Ext.define('PVE.dc.Support', { autoScroll: true, bodyStyle: 'padding:10px', listeners: { - activate: reload - } + activate: reload, + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/dc/SyncWindow.js b/www/manager6/dc/SyncWindow.js index 9355c551..25a42182 100644 --- a/www/manager6/dc/SyncWindow.js +++ b/www/manager6/dc/SyncWindow.js @@ -137,7 +137,7 @@ Ext.define('PVE.dc.SyncWindow', { reference: 'defaulthint', value: gettext('Default sync options can be set by editing the realm.'), userCls: 'pmx-hint', - hidden: true + hidden: true, }, ], }], diff --git a/www/manager6/dc/TFAEdit.js b/www/manager6/dc/TFAEdit.js index 7953faf9..39790823 100644 --- a/www/manager6/dc/TFAEdit.js +++ b/www/manager6/dc/TFAEdit.js @@ -14,7 +14,7 @@ Ext.define('PVE.window.TFAEdit', { layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, updateQrCode: function() { @@ -34,7 +34,7 @@ Ext.define('PVE.window.TFAEdit', { '&period=' + values.step + '&digits=' + values.digits + '&algorithm=' + algorithm + - '&issuer=' + encodeURIComponent(values.issuer) + '&issuer=' + encodeURIComponent(values.issuer), ); me.lookup('challenge').setVisible(true); @@ -44,7 +44,7 @@ Ext.define('PVE.window.TFAEdit', { showError: function(error) { Ext.Msg.alert( gettext('Error'), - PVE.Utils.render_u2f_error(error) + PVE.Utils.render_u2f_error(error), ); }, @@ -56,7 +56,7 @@ Ext.define('PVE.window.TFAEdit', { var msg = Ext.Msg.show({ title: 'U2F: '+gettext('Setup'), message: gettext('Please press the button on your U2F Device'), - buttons: [] + buttons: [], }); Ext.Function.defer(function() { u2f.register(data.appId, [data], [], function(data) { @@ -75,7 +75,7 @@ Ext.define('PVE.window.TFAEdit', { var params = { userid: me.userid, action: 'confirm', - response: JSON.stringify(data) + response: JSON.stringify(data), }; if (Proxmox.UserName !== 'root@pam') { params.password = me.lookup('password').value; @@ -89,12 +89,12 @@ Ext.define('PVE.window.TFAEdit', { Ext.Msg.show({ title: gettext('Success'), message: gettext('U2F Device successfully connected.'), - buttons: Ext.Msg.OK + buttons: Ext.Msg.OK, }); }, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); }, @@ -128,7 +128,7 @@ Ext.define('PVE.window.TFAEdit', { selectedTab: function(get) { return (get('tfa_type') || 'totp') + '-panel'; }, - } + }, }, afterLoading: function(realm_tfa_type, user_tfa_type) { @@ -167,8 +167,8 @@ Ext.define('PVE.window.TFAEdit', { gettext('Error'), Ext.String.format( gettext("Custom 2nd factor configuration is not supported on realms with '{0}' TFA."), - realm_tfa_type - ) + realm_tfa_type, + ), ); } }, @@ -180,7 +180,7 @@ Ext.define('PVE.window.TFAEdit', { change: function() { var me = this.getView(); me.updateQrCode(); - } + }, }, 'field': { validitychange: function(field, valid) { @@ -190,7 +190,7 @@ Ext.define('PVE.window.TFAEdit', { var challenge = me.lookup('challenge'); var password = me.lookup('password'); viewModel.set('valid', form.isValid() && challenge.isValid() && password.isValid()); - } + }, }, '#': { show: function() { @@ -209,14 +209,14 @@ Ext.define('PVE.window.TFAEdit', { failure: function(response, opts) { me.close(); Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); me.qrdiv = document.createElement('center'); me.qrcode = new QRCode(me.qrdiv, { width: 256, height: 256, - correctLevel: QRCode.CorrectLevel.M + correctLevel: QRCode.CorrectLevel.M, }); me.down('#qrbox').getEl().appendChild(me.qrdiv); @@ -224,14 +224,14 @@ Ext.define('PVE.window.TFAEdit', { me.lookup('password').setVisible(false); me.lookup('password').setDisabled(true); } - } + }, }, '#tfatabs': { tabchange: function(panel, newcard) { var viewmodel = this.getViewModel(); viewmodel.set('in_totp_tab', newcard.itemId === 'totp-panel'); - } - } + }, + }, }, applySettings: function() { @@ -244,10 +244,10 @@ Ext.define('PVE.window.TFAEdit', { config: PVE.Parser.printPropertyString({ type: 'oath', digits: values.digits, - step: values.step + step: values.step, }), // this is used to verify that the client generates the correct codes: - response: me.lookup('challenge').value + response: me.lookup('challenge').value, }; if (Proxmox.UserName !== 'root@pam') { @@ -264,7 +264,7 @@ Ext.define('PVE.window.TFAEdit', { }, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); }, @@ -273,7 +273,7 @@ Ext.define('PVE.window.TFAEdit', { var values = me.lookup('totp_form').getValues(); var params = { userid: me.getView().userid, - action: 'delete' + action: 'delete', }; if (Proxmox.UserName !== 'root@pam') { @@ -290,7 +290,7 @@ Ext.define('PVE.window.TFAEdit', { }, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); }, @@ -318,7 +318,7 @@ Ext.define('PVE.window.TFAEdit', { var params = { userid: me.getView().userid, - action: 'new' + action: 'new', }; if (Proxmox.UserName !== 'root@pam') { @@ -335,9 +335,9 @@ Ext.define('PVE.window.TFAEdit', { }, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); - } + }, }, items: [ @@ -358,11 +358,11 @@ Ext.define('PVE.window.TFAEdit', { tfa_type: 'totp', border: false, bind: { - disabled: '{!canSetupTOTP}' + disabled: '{!canSetupTOTP}', }, layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, items: [ { @@ -372,7 +372,7 @@ Ext.define('PVE.window.TFAEdit', { reference: 'totp_form', fieldDefaults: { anchor: '100%', - padding: '0 5' + padding: '0 5', }, items: [ { @@ -380,8 +380,8 @@ Ext.define('PVE.window.TFAEdit', { fieldLabel: gettext('User name'), renderer: Ext.String.htmlEncode, cbind: { - value: '{userid}' - } + value: '{userid}', + }, }, { layout: 'hbox', @@ -400,15 +400,15 @@ Ext.define('PVE.window.TFAEdit', { bind: { value: "{secret}", }, - flex: 4 + flex: 4, }, { xtype: 'button', text: gettext('Randomize'), reference: 'randomize_button', handler: 'randomizeSecret', - flex: 1 - }] + flex: 1, + }], }, { xtype: 'numberfield', @@ -418,7 +418,7 @@ Ext.define('PVE.window.TFAEdit', { hidden: true, value: 30, minValue: 10, - qrupdate: true + qrupdate: true, }, { xtype: 'numberfield', @@ -429,16 +429,16 @@ Ext.define('PVE.window.TFAEdit', { hidden: true, minValue: 6, maxValue: 8, - qrupdate: true + qrupdate: true, }, { xtype: 'textfield', fieldLabel: gettext('Issuer Name'), name: 'issuer', value: 'Proxmox Web UI', - qrupdate: true - } - ] + qrupdate: true, + }, + ], }, { xtype: 'box', @@ -451,8 +451,8 @@ Ext.define('PVE.window.TFAEdit', { 'background-color': 'white', padding: '5px', width: '266px', - height: '266px' - } + height: '266px', + }, }, { xtype: 'textfield', @@ -464,9 +464,9 @@ Ext.define('PVE.window.TFAEdit', { visible: '{showTOTPVerifiction}', }, padding: '0 5', - emptyText: gettext('Scan QR code and enter TOTP auth. code to verify') - } - ] + emptyText: gettext('Scan QR code and enter TOTP auth. code to verify'), + }, + ], }, { title: 'U2F', @@ -477,20 +477,20 @@ Ext.define('PVE.window.TFAEdit', { padding: '5 5', layout: { type: 'vbox', - align: 'middle' + align: 'middle', }, bind: { - disabled: '{!canSetupU2F}' + disabled: '{!canSetupU2F}', }, items: [ { xtype: 'label', width: 500, - text: gettext('To register a U2F device, connect the device, then click the button and follow the instructions.') - } - ] - } - ] + text: gettext('To register a U2F device, connect the device, then click the button and follow the instructions.'), + }, + ], + }, + ], }, { xtype: 'textfield', @@ -501,13 +501,13 @@ Ext.define('PVE.window.TFAEdit', { allowBlank: false, validateBlank: true, padding: '0 0 5 5', - emptyText: gettext('verify current password') - } + emptyText: gettext('verify current password'), + }, ], buttons: [ { - xtype: 'proxmoxHelpButton' + xtype: 'proxmoxHelpButton', }, '->', { @@ -515,8 +515,8 @@ Ext.define('PVE.window.TFAEdit', { handler: 'applySettings', bind: { hidden: '{!in_totp_tab}', - disabled: '{!valid}' - } + disabled: '{!valid}', + }, }, { xtype: 'button', @@ -524,8 +524,8 @@ Ext.define('PVE.window.TFAEdit', { handler: 'startU2FRegistration', bind: { hidden: '{in_totp_tab}', - disabled: '{tfa_type}' - } + disabled: '{tfa_type}', + }, }, { text: gettext('Delete'), @@ -533,9 +533,9 @@ Ext.define('PVE.window.TFAEdit', { disabled: true, handler: 'deleteTFA', bind: { - disabled: '{!canDeleteTFA}' - } - } + disabled: '{!canDeleteTFA}', + }, + }, ], initComponent: function() { @@ -548,5 +548,5 @@ Ext.define('PVE.window.TFAEdit', { me.callParent(); Ext.GlobalEvents.fireEvent('proxmoxShowHelp', 'pveum_tfa_auth'); - } + }, }); diff --git a/www/manager6/dc/Tasks.js b/www/manager6/dc/Tasks.js index 6708d67d..ae7c3dc8 100644 --- a/www/manager6/dc/Tasks.js +++ b/www/manager6/dc/Tasks.js @@ -15,8 +15,8 @@ Ext.define('PVE.dc.Tasks', { model: 'proxmox-tasks', proxy: { type: 'proxmox', - url: '/api2/json/cluster/tasks' - } + url: '/api2/json/cluster/tasks', + }, }); var store = Ext.create('Proxmox.data.DiffStore', { @@ -26,13 +26,13 @@ Ext.define('PVE.dc.Tasks', { sorters: [ { property : 'pid', - direction: 'DESC' + direction: 'DESC', }, { property : 'starttime', - direction: 'DESC' - } - ] + direction: 'DESC', + }, + ], }); @@ -64,7 +64,7 @@ Ext.define('PVE.dc.Tasks', { if (status && status != 'OK') { return "proxmox-invalid-row"; } - } + }, }, sortableColumns: false, columns: [ @@ -74,7 +74,7 @@ Ext.define('PVE.dc.Tasks', { width: 150, renderer: function(value) { return Ext.Date.format(value, "M d H:i:s"); - } + }, }, { header: gettext("End Time"), @@ -92,24 +92,24 @@ Ext.define('PVE.dc.Tasks', { return ""; } return Ext.Date.format(value, "M d H:i:s"); - } + }, }, { header: gettext("Node"), dataIndex: 'node', - width: 100 + width: 100, }, { header: gettext("User name"), dataIndex: 'user', renderer: Ext.String.htmlEncode, - width: 150 + width: 150, }, { header: gettext("Description"), dataIndex: 'upid', flex: 1, - renderer: Proxmox.Utils.render_upid + renderer: Proxmox.Utils.render_upid, }, { header: gettext("Status"), @@ -127,16 +127,16 @@ Ext.define('PVE.dc.Tasks', { } // metaData.attr = 'style="color:red;"'; return Proxmox.Utils.errorText + ': ' + value; - } - } + }, + }, ], listeners: { itemdblclick: run_task_viewer, show: () => taskstore.startUpdate(), destroy: () => taskstore.stopUpdate(), - } + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/dc/UserEdit.js b/www/manager6/dc/UserEdit.js index 3d3a71ab..ae2882ff 100644 --- a/www/manager6/dc/UserEdit.js +++ b/www/manager6/dc/UserEdit.js @@ -38,7 +38,7 @@ Ext.define('PVE.dc.UserEdit', { submitValue: false, disabled: true, hidden: true, - validator: validate_pw + validator: validate_pw, }); pwfield = Ext.createWidget('textfield', { @@ -48,7 +48,7 @@ Ext.define('PVE.dc.UserEdit', { name: 'password', disabled: true, hidden: true, - validator: validate_pw + validator: validate_pw, }); var update_passwd_field = function(realm) { @@ -74,7 +74,7 @@ Ext.define('PVE.dc.UserEdit', { value: me.userid, renderer: Ext.String.htmlEncode, allowBlank: false, - submitValue: me.isCreate ? true : false + submitValue: me.isCreate ? true : false, }, pwfield, verifypw, { @@ -82,7 +82,7 @@ Ext.define('PVE.dc.UserEdit', { name: 'groups', multiSelect: true, allowBlank: true, - fieldLabel: gettext('Group') + fieldLabel: gettext('Group'), }, { xtype: 'pmxExpireDate', @@ -94,31 +94,31 @@ Ext.define('PVE.dc.UserEdit', { name: 'enable', uncheckedValue: 0, defaultValue: 1, - checked: true - } + checked: true, + }, ]; var column2 = [ { xtype: 'textfield', name: 'firstname', - fieldLabel: gettext('First Name') + fieldLabel: gettext('First Name'), }, { xtype: 'textfield', name: 'lastname', - fieldLabel: gettext('Last Name') + fieldLabel: gettext('Last Name'), }, { xtype: 'textfield', name: 'email', fieldLabel: gettext('E-Mail'), - vtype: 'proxmoxMail' - } + vtype: 'proxmoxMail', + }, ]; if (me.isCreate) { - column1.splice(1,0,{ + column1.splice(1, 0, { xtype: 'pmxRealmComboBox', name: 'realm', fieldLabel: gettext('Realm'), @@ -129,9 +129,9 @@ Ext.define('PVE.dc.UserEdit', { change: function(combo, newValue){ realm = newValue; update_passwd_field(realm); - } + }, }, - submitValue: false + submitValue: false, }); } @@ -142,15 +142,15 @@ Ext.define('PVE.dc.UserEdit', { { xtype: 'textfield', name: 'comment', - fieldLabel: gettext('Comment') - } + fieldLabel: gettext('Comment'), + }, ], advancedItems: [ { xtype: 'textfield', name: 'keys', - fieldLabel: gettext('Key IDs') - } + fieldLabel: gettext('Key IDs'), + }, ], onGetValues: function(values) { if (realm) { @@ -162,7 +162,7 @@ Ext.define('PVE.dc.UserEdit', { } return values; - } + }, }); Ext.applyIf(me, { @@ -170,9 +170,9 @@ Ext.define('PVE.dc.UserEdit', { url: url, method: method, fieldDefaults: { - labelWidth: 110 // for spanish translation + labelWidth: 110, // for spanish translation }, - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -187,8 +187,8 @@ Ext.define('PVE.dc.UserEdit', { me.down('[name="keys"]').setDisabled(1); } } - } + }, }); } - } + }, }); diff --git a/www/manager6/dc/UserView.js b/www/manager6/dc/UserView.js index 655bb074..11a89edd 100644 --- a/www/manager6/dc/UserView.js +++ b/www/manager6/dc/UserView.js @@ -18,8 +18,8 @@ Ext.define('PVE.dc.UserView', { model: 'pve-users', sorters: { property: 'userid', - order: 'DESC' - } + order: 'DESC', + }, }); var reload = function() { @@ -39,7 +39,7 @@ Ext.define('PVE.dc.UserView', { }, callback: function() { reload(); - } + }, }); var run_editor = function() { @@ -48,8 +48,8 @@ Ext.define('PVE.dc.UserView', { return; } - var win = Ext.create('PVE.dc.UserEdit',{ - userid: rec.data.userid + var win = Ext.create('PVE.dc.UserEdit', { + userid: rec.data.userid, }); win.on('destroy', reload); win.show(); @@ -62,7 +62,7 @@ Ext.define('PVE.dc.UserView', { return !!caps.access['User.Modify']; }, selModel: sm, - handler: run_editor + handler: run_editor, }); var pwchange_btn = new Proxmox.button.Button({ @@ -71,11 +71,11 @@ Ext.define('PVE.dc.UserView', { selModel: sm, handler: function(btn, event, rec) { var win = Ext.create('Proxmox.window.PasswordEdit', { - userid: rec.data.userid + userid: rec.data.userid, }); win.on('destroy', reload); win.show(); - } + }, }); var tfachange_btn = new Proxmox.button.Button({ @@ -85,13 +85,13 @@ Ext.define('PVE.dc.UserView', { handler: function(btn, event, rec) { var d = rec.data; var tfa_type = PVE.Parser.parseTfaType(d.keys); - var win = Ext.create('PVE.window.TFAEdit',{ + var win = Ext.create('PVE.window.TFAEdit', { tfa_type: tfa_type, - userid: d.userid + userid: d.userid, }); win.on('destroy', reload); win.show(); - } + }, }); var perm_btn = new Proxmox.button.Button({ @@ -100,10 +100,10 @@ Ext.define('PVE.dc.UserView', { selModel: sm, handler: function(btn, event, rec) { var win = Ext.create('PVE.dc.PermissionView', { - userid: rec.data.userid + userid: rec.data.userid, }); win.show(); - } + }, }); var tbar = [ @@ -111,13 +111,13 @@ Ext.define('PVE.dc.UserView', { text: gettext('Add'), disabled: !caps.access['User.Modify'], handler: function() { - var win = Ext.create('PVE.dc.UserEdit',{ + var win = Ext.create('PVE.dc.UserEdit', { }); win.on('destroy', reload); win.show(); - } + }, }, - edit_btn, remove_btn, pwchange_btn, tfachange_btn, perm_btn + edit_btn, remove_btn, pwchange_btn, tfachange_btn, perm_btn, ]; var render_username = function(userid) { @@ -133,7 +133,7 @@ Ext.define('PVE.dc.UserView', { selModel: sm, tbar: tbar, viewConfig: { - trackOver: false + trackOver: false, }, columns: [ { @@ -141,35 +141,35 @@ Ext.define('PVE.dc.UserView', { width: 200, sortable: true, renderer: render_username, - dataIndex: 'userid' + dataIndex: 'userid', }, { header: gettext('Realm'), width: 100, sortable: true, renderer: render_realm, - dataIndex: 'userid' + dataIndex: 'userid', }, { header: gettext('Enabled'), width: 80, sortable: true, renderer: Proxmox.Utils.format_boolean, - dataIndex: 'enable' + dataIndex: 'enable', }, { header: gettext('Expire'), width: 80, sortable: true, renderer: Proxmox.Utils.format_expire, - dataIndex: 'expire' + dataIndex: 'expire', }, { header: gettext('Name'), width: 150, sortable: true, renderer: PVE.Utils.render_full_name, - dataIndex: 'firstname' + dataIndex: 'firstname', }, { header: 'TFA', @@ -185,24 +185,24 @@ Ext.define('PVE.dc.UserView', { return tfa_type; } }, - dataIndex: 'keys' + dataIndex: 'keys', }, { header: gettext('Comment'), sortable: false, renderer: Ext.String.htmlEncode, dataIndex: 'comment', - flex: 1 - } + flex: 1, + }, ], listeners: { activate: reload, - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }); me.callParent(); Proxmox.Utils.monStoreErrors(me, store); - } + }, }); diff --git a/www/manager6/form/ACMEAccountSelector.js b/www/manager6/form/ACMEAccountSelector.js index c2c24d15..dc7074a9 100644 --- a/www/manager6/form/ACMEAccountSelector.js +++ b/www/manager6/form/ACMEAccountSelector.js @@ -18,5 +18,5 @@ Ext.define('PVE.form.ACMEAccountSelector', { isEmpty: function() { return this.getStore().getData().length === 0; - } + }, }); diff --git a/www/manager6/form/AgentFeatureSelector.js b/www/manager6/form/AgentFeatureSelector.js index 6c21306f..0dcc6ecb 100644 --- a/www/manager6/form/AgentFeatureSelector.js +++ b/www/manager6/form/AgentFeatureSelector.js @@ -19,7 +19,7 @@ Ext.define('PVE.form.AgentFeatureSelector', { bind: { disabled: '{!enabled.checked}', }, - disabled: true + disabled: true, }, { xtype: 'displayfield', @@ -43,7 +43,7 @@ Ext.define('PVE.form.AgentFeatureSelector', { ['virtio', 'VirtIO'], ['isa', 'ISA'], ], - } + }, ], onGetValues: function(values) { @@ -54,5 +54,5 @@ Ext.define('PVE.form.AgentFeatureSelector', { setValues: function(values) { let res = PVE.Parser.parsePropertyString(values.agent, 'enabled'); this.callParent([res]); - } + }, }); diff --git a/www/manager6/form/BackupModeSelector.js b/www/manager6/form/BackupModeSelector.js index ca57dda9..e7600b05 100644 --- a/www/manager6/form/BackupModeSelector.js +++ b/www/manager6/form/BackupModeSelector.js @@ -4,6 +4,6 @@ Ext.define('PVE.form.BackupModeSelector', { comboItems: [ ['snapshot', gettext('Snapshot')], ['suspend', gettext('Suspend')], - ['stop', gettext('Stop')] - ] + ['stop', gettext('Stop')], + ], }); diff --git a/www/manager6/form/BandwidthSelector.js b/www/manager6/form/BandwidthSelector.js index dab7c6be..de99586f 100644 --- a/www/manager6/form/BandwidthSelector.js +++ b/www/manager6/form/BandwidthSelector.js @@ -10,14 +10,14 @@ Ext.define('PVE.form.BandwidthField', { }, formulas: { unitlabel: (get) => get('unit') + '/s', - } + }, }, emptyText: '', layout: 'hbox', defaults: { - hideLabel: true + hideLabel: true, }, units: { diff --git a/www/manager6/form/Boolean.js b/www/manager6/form/Boolean.js index 5ae73fe7..f67c7244 100644 --- a/www/manager6/form/Boolean.js +++ b/www/manager6/form/Boolean.js @@ -5,6 +5,6 @@ Ext.define('PVE.form.Boolean', { comboItems: [ ['__default__', gettext('Default')], [1, gettext('Yes')], - [0, gettext('No')] - ] + [0, gettext('No')], + ], }); diff --git a/www/manager6/form/BridgeSelector.js b/www/manager6/form/BridgeSelector.js index 94bfa3af..e3f57f7c 100644 --- a/www/manager6/form/BridgeSelector.js +++ b/www/manager6/form/BridgeSelector.js @@ -10,9 +10,9 @@ Ext.define('PVE.form.BridgeSelector', { sorters: [ { property : 'iface', - direction: 'ASC' - } - ] + direction: 'ASC', + }, + ], }, valueField: 'iface', displayField: 'iface', @@ -22,21 +22,21 @@ Ext.define('PVE.form.BridgeSelector', { header: gettext('Bridge'), dataIndex: 'iface', hideable: false, - width: 100 + width: 100, }, { header: gettext('Active'), width: 60, dataIndex: 'active', - renderer: Proxmox.Utils.format_boolean + renderer: Proxmox.Utils.format_boolean, }, { header: gettext('Comment'), dataIndex: 'comments', renderer: Ext.String.htmlEncode, - flex: 1 - } - ] + flex: 1, + }, + ], }, setNodename: function(nodename) { @@ -51,7 +51,7 @@ Ext.define('PVE.form.BridgeSelector', { me.store.setProxy({ type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/network?type=' + - me.bridgeType + me.bridgeType, }); me.store.load(); @@ -66,6 +66,6 @@ Ext.define('PVE.form.BridgeSelector', { me.callParent(); me.setNodename(nodename); - } + }, }); diff --git a/www/manager6/form/BusTypeSelector.js b/www/manager6/form/BusTypeSelector.js index c886941f..13027f5a 100644 --- a/www/manager6/form/BusTypeSelector.js +++ b/www/manager6/form/BusTypeSelector.js @@ -16,5 +16,5 @@ Ext.define('PVE.form.BusTypeSelector', { me.comboItems.push(['scsi', 'SCSI']); me.callParent(); - } + }, }); diff --git a/www/manager6/form/CPUModelSelector.js b/www/manager6/form/CPUModelSelector.js index deef23fb..c04adc60 100644 --- a/www/manager6/form/CPUModelSelector.js +++ b/www/manager6/form/CPUModelSelector.js @@ -4,8 +4,8 @@ Ext.define('PVE.data.CPUModel', { {name: 'name'}, {name: 'vendor'}, {name: 'custom'}, - {name: 'displayname'} - ] + {name: 'displayname'}, + ], }); Ext.define('PVE.form.CPUModelSelector', { @@ -32,17 +32,17 @@ Ext.define('PVE.form.CPUModelSelector', { dataIndex: 'displayname', hideable: false, sortable: true, - flex: 3 + flex: 3, }, { header: gettext('Vendor'), dataIndex: 'vendor', hideable: false, sortable: true, - flex: 2 - } + flex: 2, + }, ], - width: 360 + width: 360, }, store: { @@ -50,7 +50,7 @@ Ext.define('PVE.form.CPUModelSelector', { model: 'PVE.data.CPUModel', proxy: { type: 'proxmox', - url: '/api2/json/nodes/localhost/cpu' + url: '/api2/json/nodes/localhost/cpu', }, sorters: [ { @@ -71,8 +71,8 @@ Ext.define('PVE.form.CPUModelSelector', { // Within same vendor, sort alphabetically return a.name.localeCompare(b.name); }, - direction: 'ASC' - } + direction: 'ASC', + }, ], listeners: { load: function(store, records, success) { @@ -98,7 +98,7 @@ Ext.define('PVE.form.CPUModelSelector', { store.sort(); } - } - } - } + }, + }, + }, }); diff --git a/www/manager6/form/CacheTypeSelector.js b/www/manager6/form/CacheTypeSelector.js index 0044848a..ef6545f1 100644 --- a/www/manager6/form/CacheTypeSelector.js +++ b/www/manager6/form/CacheTypeSelector.js @@ -7,6 +7,6 @@ Ext.define('PVE.form.CacheTypeSelector', { ['writethrough', 'Write through'], ['writeback', 'Write back'], ['unsafe', 'Write back (' + gettext('unsafe') + ')'], - ['none', gettext('No cache')] - ] + ['none', gettext('No cache')], + ], }); diff --git a/www/manager6/form/CalendarEvent.js b/www/manager6/form/CalendarEvent.js index c3b9ecab..0bd3fc1e 100644 --- a/www/manager6/form/CalendarEvent.js +++ b/www/manager6/form/CalendarEvent.js @@ -16,20 +16,20 @@ Ext.define('PVE.form.CalendarEvent', { { value: '2,22:30', text: gettext("Every day") + " 02:30, 22:30"}, { value: 'mon..fri', text: gettext("Monday to Friday") + " 00:00"}, { value: 'mon..fri */1:00', text: gettext("Monday to Friday") + ': ' + gettext("hourly")}, - { value: 'sun 01:00', text: gettext("Sunday") + " 01:00"} - ] + { value: 'sun 01:00', text: gettext("Sunday") + " 01:00"}, + ], }, tpl: [ '
    ', '
  • {text}
    • ', - '
' + '', ], displayTpl: [ '', '{value}', - '' - ] + '', + ], }); diff --git a/www/manager6/form/CephPoolSelector.js b/www/manager6/form/CephPoolSelector.js index c53c7826..0cfbeec7 100644 --- a/www/manager6/form/CephPoolSelector.js +++ b/www/manager6/form/CephPoolSelector.js @@ -20,12 +20,12 @@ Ext.define('PVE.form.CephPoolSelector', { sorters: 'name', proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/ceph/pools' - } + url: '/api2/json/nodes/' + me.nodename + '/ceph/pools', + }, }); Ext.apply(me, { - store: store + store: store, }); me.callParent(); @@ -35,8 +35,8 @@ Ext.define('PVE.form.CephPoolSelector', { if (success && rec.length > 0) { me.select(rec[0]); } - } + }, }); - } + }, }); diff --git a/www/manager6/form/CompressionSelector.js b/www/manager6/form/CompressionSelector.js index 49764124..745b96d6 100644 --- a/www/manager6/form/CompressionSelector.js +++ b/www/manager6/form/CompressionSelector.js @@ -6,5 +6,5 @@ Ext.define('PVE.form.CompressionSelector', { ['lzo', 'LZO (' + gettext('fast') + ')'], ['gzip', 'GZIP (' + gettext('good') + ')'], ['zstd', 'ZSTD (' + gettext('fast and good') + ')'], - ] + ], }); diff --git a/www/manager6/form/ContentTypeSelector.js b/www/manager6/form/ContentTypeSelector.js index be38a186..d0fa0b08 100644 --- a/www/manager6/form/ContentTypeSelector.js +++ b/www/manager6/form/ContentTypeSelector.js @@ -18,5 +18,5 @@ Ext.define('PVE.form.ContentTypeSelector', { }); me.callParent(); - } + }, }); diff --git a/www/manager6/form/ControllerSelector.js b/www/manager6/form/ControllerSelector.js index 9fdae5d1..f229c7ce 100644 --- a/www/manager6/form/ControllerSelector.js +++ b/www/manager6/form/ControllerSelector.js @@ -75,7 +75,7 @@ clist_loop: fieldLabel: gettext('Bus/Device'), layout: 'hbox', defaults: { - hideLabel: true + hideLabel: true, }, items: [ { @@ -93,8 +93,8 @@ clist_loop: var field = me.down('field[name=deviceid]'); field.setMaxValue(PVE.Utils.diskControllerMaxIDs[value]); field.validate(); - } - } + }, + }, }, { xtype: 'proxmoxintegerfield', @@ -115,11 +115,11 @@ clist_loop: return "This device is already in use."; } return true; - } - } - ] + }, + }, + ], }); me.callParent(); - } + }, }); diff --git a/www/manager6/form/DayOfWeekSelector.js b/www/manager6/form/DayOfWeekSelector.js index bd23fc28..164dd5d4 100644 --- a/www/manager6/form/DayOfWeekSelector.js +++ b/www/manager6/form/DayOfWeekSelector.js @@ -11,8 +11,8 @@ Ext.define('PVE.form.DayOfWeekSelector', { ['thu', Ext.util.Format.htmlDecode(Ext.Date.dayNames[4])], ['fri', Ext.util.Format.htmlDecode(Ext.Date.dayNames[5])], ['sat', Ext.util.Format.htmlDecode(Ext.Date.dayNames[6])], - ['sun', Ext.util.Format.htmlDecode(Ext.Date.dayNames[0])] + ['sun', Ext.util.Format.htmlDecode(Ext.Date.dayNames[0])], ]; this.callParent(); - } + }, }); diff --git a/www/manager6/form/DiskFormatSelector.js b/www/manager6/form/DiskFormatSelector.js index 6c84fb98..bbd442cc 100644 --- a/www/manager6/form/DiskFormatSelector.js +++ b/www/manager6/form/DiskFormatSelector.js @@ -4,6 +4,6 @@ Ext.define('PVE.form.DiskFormatSelector', { comboItems: [ ['raw', gettext('Raw disk image') + ' (raw)'], ['qcow2', gettext('QEMU image format') + ' (qcow2)'], - ['vmdk', gettext('VMware image format') + ' (vmdk)'] - ] + ['vmdk', gettext('VMware image format') + ' (vmdk)'], + ], }); diff --git a/www/manager6/form/DiskStorageSelector.js b/www/manager6/form/DiskStorageSelector.js index 445e3ac0..453dc199 100644 --- a/www/manager6/form/DiskStorageSelector.js +++ b/www/manager6/form/DiskStorageSelector.js @@ -4,7 +4,7 @@ Ext.define('PVE.form.DiskStorageSelector', { layout: 'fit', defaults: { - margin: '0 0 5 0' + margin: '0 0 5 0', }, // the fieldLabel for the storageselector @@ -119,9 +119,9 @@ Ext.define('PVE.form.DiskStorageSelector', { listeners: { change: { fn: me.changeStorage, - scope: me - } - } + scope: me, + }, + }, }, { xtype: 'pveFileSelector', @@ -131,7 +131,7 @@ Ext.define('PVE.form.DiskStorageSelector', { fieldLabel: gettext('Disk image'), nodename: me.nodename, disabled: true, - hidden: true + hidden: true, }, { xtype: 'numberfield', @@ -145,7 +145,7 @@ Ext.define('PVE.form.DiskStorageSelector', { maxValue: 128*1024, decimalPrecision: 3, value: me.defaultSize, - allowBlank: false + allowBlank: false, }, { xtype: 'pveDiskFormatSelector', @@ -157,13 +157,13 @@ Ext.define('PVE.form.DiskStorageSelector', { disabled: true, hidden: me.storageContent === 'rootdir', value: 'qcow2', - allowBlank: false - } + allowBlank: false, + }, ]; // use it to disable the children but not ourself me.disabled = false; me.callParent(); - } + }, }); diff --git a/www/manager6/form/EmailNotificationSelector.js b/www/manager6/form/EmailNotificationSelector.js index 67abbec1..44b7af3e 100644 --- a/www/manager6/form/EmailNotificationSelector.js +++ b/www/manager6/form/EmailNotificationSelector.js @@ -3,6 +3,6 @@ Ext.define('PVE.form.EmailNotificationSelector', { alias: ['widget.pveEmailNotificationSelector'], comboItems: [ ['always', gettext('Always')], - ['failure', gettext('On failure only')] - ] + ['failure', gettext('On failure only')], + ], }); diff --git a/www/manager6/form/FileSelector.js b/www/manager6/form/FileSelector.js index 3dc50720..94e716d6 100644 --- a/www/manager6/form/FileSelector.js +++ b/www/manager6/form/FileSelector.js @@ -12,7 +12,7 @@ Ext.define('PVE.form.FileSelector', { if (!me.disabled) { me.setStorage(me.storage, me.nodename); } - } + }, }, setStorage: function(storage, nodename) { @@ -40,7 +40,7 @@ Ext.define('PVE.form.FileSelector', { me.store.setProxy({ type: 'proxmox', - url: url + url: url, }); me.store.removeAll(); @@ -52,7 +52,7 @@ Ext.define('PVE.form.FileSelector', { }, store: { - model: 'pve-storage-content' + model: 'pve-storage-content', }, allowBlank: false, @@ -67,19 +67,19 @@ Ext.define('PVE.form.FileSelector', { header: gettext('Name'), dataIndex: 'text', hideable: false, - flex: 1 + flex: 1, }, { header: gettext('Format'), width: 60, - dataIndex: 'format' + dataIndex: 'format', }, { header: gettext('Size'), width: 100, dataIndex: 'size', - renderer: Proxmox.Utils.format_size - } - ] - } + renderer: Proxmox.Utils.format_size, + }, + ], + }, }); diff --git a/www/manager6/form/FirewallPolicySelector.js b/www/manager6/form/FirewallPolicySelector.js index c15f73e3..a5c9d42a 100644 --- a/www/manager6/form/FirewallPolicySelector.js +++ b/www/manager6/form/FirewallPolicySelector.js @@ -4,6 +4,6 @@ Ext.define('PVE.form.FirewallPolicySelector', { comboItems: [ ['ACCEPT', 'ACCEPT'], ['REJECT', 'REJECT'], - [ 'DROP', 'DROP'] - ] + [ 'DROP', 'DROP'], + ], }); diff --git a/www/manager6/form/GlobalSearchField.js b/www/manager6/form/GlobalSearchField.js index e41b0f0b..19bcb6f7 100644 --- a/www/manager6/form/GlobalSearchField.js +++ b/www/manager6/form/GlobalSearchField.js @@ -28,19 +28,19 @@ Ext.define('PVE.form.GlobalSearchField', { scrollable: { xtype: 'scroller', y: true, - x:false + x:false, }, store: { model: 'PVEResources', proxy:{ type: 'proxmox', - url: '/api2/extjs/cluster/resources' - } + url: '/api2/extjs/cluster/resources', + }, }, plugins: { ptype: 'bufferedrenderer', trailingBufferZone: 20, - leadingBufferZone: 20 + leadingBufferZone: 20, }, hideMe: function() { @@ -70,9 +70,9 @@ Ext.define('PVE.form.GlobalSearchField', { }, /* because of lint */ focusleave: { - fn: 'hideMe' + fn: 'hideMe', }, - focusenter: 'setFocus' + focusenter: 'setFocus', }, columns: [ @@ -80,29 +80,29 @@ Ext.define('PVE.form.GlobalSearchField', { text: gettext('Type'), dataIndex: 'type', width: 100, - renderer: PVE.Utils.render_resource_type + renderer: PVE.Utils.render_resource_type, }, { text: gettext('Description'), flex: 1, - dataIndex: 'text' + dataIndex: 'text', }, { text: gettext('Node'), - dataIndex: 'node' + dataIndex: 'node', }, { text: gettext('Pool'), - dataIndex: 'pool' - } - ] + dataIndex: 'pool', + }, + ], }, customFilter: function(item) { var me = this; var match = 0; var fieldArr = []; - var i,j, fields; + var i, j, fields; // different types of objects have different fields to search // for example, a node will never have a pool and vice versa @@ -208,14 +208,14 @@ Ext.define('PVE.form.GlobalSearchField', { listeners: { change: { fn: 'updateFilter', - buffer: 250 + buffer: 250, }, specialkey: 'onKey', focusenter: 'loadValues', focusleave: { fn: 'hideGrid', - delay: 100 - } + delay: 100, + }, }, toggleFocus: function() { @@ -248,13 +248,13 @@ Ext.define('PVE.form.GlobalSearchField', { ctrl: true, shift: true, fn: me.toggleFocus, - scope: me - },{ + scope: me, + }, { key:' ', ctrl: true, fn: me.toggleFocus, - scope: me - }] + scope: me, + }], }); // always select first item and @@ -263,9 +263,9 @@ Ext.define('PVE.form.GlobalSearchField', { me.grid.getSelectionModel().select(0); me.grid.store.sort({ property: 'relevance', - direction: 'DESC' + direction: 'DESC', }); }); - } + }, }); diff --git a/www/manager6/form/GroupSelector.js b/www/manager6/form/GroupSelector.js index 38fc196c..34e5e905 100644 --- a/www/manager6/form/GroupSelector.js +++ b/www/manager6/form/GroupSelector.js @@ -3,9 +3,9 @@ Ext.define('pve-groups', { fields: [ 'groupid', 'comment', 'users' ], proxy: { type: 'proxmox', - url: "/api2/json/access/groups" + url: "/api2/json/access/groups", }, - idProperty: 'groupid' + idProperty: 'groupid', }); Ext.define('PVE.form.GroupSelector', { @@ -22,23 +22,23 @@ Ext.define('PVE.form.GroupSelector', { header: gettext('Group'), sortable: true, dataIndex: 'groupid', - flex: 1 + flex: 1, }, { header: gettext('Comment'), sortable: false, dataIndex: 'comment', renderer: Ext.String.htmlEncode, - flex: 1 + flex: 1, }, { header: gettext('Users'), sortable: false, dataIndex: 'users', renderer: Ext.String.htmlEncode, - flex: 1 - } - ] + flex: 1, + }, + ], }, initComponent: function() { @@ -47,16 +47,16 @@ Ext.define('PVE.form.GroupSelector', { var store = new Ext.data.Store({ model: 'pve-groups', sorters: [{ - property: 'groupid' - }] + property: 'groupid', + }], }); Ext.apply(me, { - store: store + store: store, }); me.callParent(); store.load(); - } + }, }); diff --git a/www/manager6/form/GuestIDSelector.js b/www/manager6/form/GuestIDSelector.js index f796034b..e24c01c9 100644 --- a/www/manager6/form/GuestIDSelector.js +++ b/www/manager6/form/GuestIDSelector.js @@ -70,10 +70,10 @@ Ext.define('PVE.form.GuestIDSelector', { failure: function(response, opts) { me.exists = true; me.validate(); - } + }, }); - } - } + }, + }, }); me.callParent(); @@ -84,8 +84,8 @@ Ext.define('PVE.form.GuestIDSelector', { method: 'GET', success: function(response, opts) { me.setRawValue(response.result.data); - } + }, }); } - } + }, }); diff --git a/www/manager6/form/HotplugFeatureSelector.js b/www/manager6/form/HotplugFeatureSelector.js index 86a46c9e..75cd7cc7 100644 --- a/www/manager6/form/HotplugFeatureSelector.js +++ b/www/manager6/form/HotplugFeatureSelector.js @@ -7,32 +7,32 @@ Ext.define('PVE.form.HotplugFeatureSelector', { defaults: { name: 'hotplugCbGroup', - submitValue: false + submitValue: false, }, items: [ { boxLabel: gettext('Disk'), inputValue: 'disk', - checked: true + checked: true, }, { boxLabel: gettext('Network'), inputValue: 'network', - checked: true + checked: true, }, { boxLabel: 'USB', inputValue: 'usb', - checked: true + checked: true, }, { boxLabel: gettext('Memory'), - inputValue: 'memory' + inputValue: 'memory', }, { boxLabel: gettext('CPU'), - inputValue: 'cpu' - } + inputValue: 'cpu', + }, ], setValue: function(value) { @@ -64,6 +64,6 @@ Ext.define('PVE.form.HotplugFeatureSelector', { } else { return { 'hotplug': data.join(',') }; } - } + }, }); diff --git a/www/manager6/form/IPProtocolSelector.js b/www/manager6/form/IPProtocolSelector.js index 5a53b125..35da9b28 100644 --- a/www/manager6/form/IPProtocolSelector.js +++ b/www/manager6/form/IPProtocolSelector.js @@ -10,23 +10,23 @@ Ext.define('PVE.form.IPProtocolSelector', { dataIndex: 'p', hideable: false, sortable: false, - width: 100 + width: 100, }, { header: gettext('Number'), dataIndex: 'n', hideable: false, sortable: false, - width: 50 + width: 50, }, { header: gettext('Description'), dataIndex: 'd', hideable: false, sortable: false, - flex: 1 - } - ] + flex: 1, + }, + ], }, store: { fields: [ 'p', 'd', 'n'], @@ -81,7 +81,7 @@ Ext.define('PVE.form.IPProtocolSelector', { { p: 'hip', n: 139, d: 'Host Identity Protocol' }, { p: 'shim6', n: 140, d: 'Shim6 Protocol [RFC5533]' }, { p: 'wesp', n: 141, d: 'Wrapped Encapsulating Security Payload' }, - { p: 'rohc', n: 142, d: 'Robust Header Compression' } - ] - } + { p: 'rohc', n: 142, d: 'Robust Header Compression' }, + ], + }, }); diff --git a/www/manager6/form/IPRefSelector.js b/www/manager6/form/IPRefSelector.js index d7662136..1f3698ac 100644 --- a/www/manager6/form/IPRefSelector.js +++ b/www/manager6/form/IPRefSelector.js @@ -30,12 +30,12 @@ Ext.define('PVE.form.IPRefSelector', { idProperty: 'ref', proxy: { type: 'proxmox', - url: url + url: url, }, sorters: { property: 'ref', - order: 'DESC' - } + order: 'DESC', + }, }); var disable_query_for_ips = function(f, value) { @@ -54,7 +54,7 @@ Ext.define('PVE.form.IPRefSelector', { header: gettext('Type'), dataIndex: 'type', hideable: false, - width: 60 + width: 60, }); } @@ -63,24 +63,24 @@ Ext.define('PVE.form.IPRefSelector', { header: gettext('Name'), dataIndex: 'ref', hideable: false, - width: 140 + width: 140, }, { header: gettext('Comment'), dataIndex: 'comment', renderer: Ext.String.htmlEncode, - flex: 1 - } + flex: 1, + }, ); Ext.apply(me, { store: store, - listConfig: { columns: columns } + listConfig: { columns: columns }, }); me.on('change', disable_query_for_ips); me.callParent(); - } + }, }); diff --git a/www/manager6/form/MDevSelector.js b/www/manager6/form/MDevSelector.js index cab65ff7..6c634272 100644 --- a/www/manager6/form/MDevSelector.js +++ b/www/manager6/form/MDevSelector.js @@ -3,14 +3,14 @@ Ext.define('PVE.form.MDevSelector', { xtype: 'pveMDevSelector', store: { - fields: [ 'type','available', 'description' ], + fields: [ 'type', 'available', 'description' ], filterOnLoad: true, sorters: [ { property : 'type', - direction: 'ASC' - } - ] + direction: 'ASC', + }, + ], }, autoSelect: false, valueField: 'type', @@ -20,12 +20,12 @@ Ext.define('PVE.form.MDevSelector', { { header: gettext('Type'), dataIndex: 'type', - flex: 1 + flex: 1, }, { header: gettext('Available'), dataIndex: 'available', - width: 80 + width: 80, }, { header: gettext('Description'), @@ -37,9 +37,9 @@ Ext.define('PVE.form.MDevSelector', { } return value.split('\n').join('
'); - } - } - ] + }, + }, + ], }, setPciID: function(pciid, force) { @@ -69,7 +69,7 @@ Ext.define('PVE.form.MDevSelector', { var me = this; me.store.setProxy({ type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/hardware/pci/' + me.pciid + '/mdev' + url: '/api2/json/nodes/' + me.nodename + '/hardware/pci/' + me.pciid + '/mdev', }); me.store.load(); }, @@ -86,6 +86,6 @@ Ext.define('PVE.form.MDevSelector', { if (me.pciid) { me.setPciID(me.pciid, true); } - } + }, }); diff --git a/www/manager6/form/MemoryField.js b/www/manager6/form/MemoryField.js index 8d5dc030..c4d92643 100644 --- a/www/manager6/form/MemoryField.js +++ b/www/manager6/form/MemoryField.js @@ -83,5 +83,5 @@ Ext.define('PVE.form.MemoryField', { } me.callParent(); - } + }, }); diff --git a/www/manager6/form/NetworkCardSelector.js b/www/manager6/form/NetworkCardSelector.js index 9f1c7d55..3209cbe9 100644 --- a/www/manager6/form/NetworkCardSelector.js +++ b/www/manager6/form/NetworkCardSelector.js @@ -5,6 +5,6 @@ Ext.define('PVE.form.NetworkCardSelector', { ['e1000', 'Intel E1000'], ['virtio', 'VirtIO (' + gettext('paravirtualized') + ')'], ['rtl8139', 'Realtek RTL8139'], - ['vmxnet3', 'VMware vmxnet3'] - ] + ['vmxnet3', 'VMware vmxnet3'], + ], }); diff --git a/www/manager6/form/NodeSelector.js b/www/manager6/form/NodeSelector.js index 06286992..aa428f3e 100644 --- a/www/manager6/form/NodeSelector.js +++ b/www/manager6/form/NodeSelector.js @@ -22,18 +22,18 @@ Ext.define('PVE.form.NodeSelector', { fields: [ 'node', 'cpu', 'maxcpu', 'mem', 'maxmem', 'uptime' ], proxy: { type: 'proxmox', - url: '/api2/json/nodes' + url: '/api2/json/nodes', }, sorters: [ { property : 'node', - direction: 'ASC' + direction: 'ASC', }, { property : 'mem', - direction: 'DESC' - } - ] + direction: 'DESC', + }, + ], }, listConfig: { @@ -43,23 +43,23 @@ Ext.define('PVE.form.NodeSelector', { dataIndex: 'node', sortable: true, hideable: false, - flex: 1 + flex: 1, }, { header: gettext('Memory usage') + " %", renderer: PVE.Utils.render_mem_usage_percent, sortable: true, width: 100, - dataIndex: 'mem' + dataIndex: 'mem', }, { header: gettext('CPU usage'), renderer: PVE.Utils.render_cpu, sortable: true, width: 100, - dataIndex: 'cpu' - } - ] + dataIndex: 'cpu', + }, + ], }, validator: function(value) { @@ -108,11 +108,11 @@ Ext.define('PVE.form.NodeSelector', { } else { return true; } - } + }, })); me.mon(me.getStore(), 'load', function(){ me.isValid(); }); - } + }, }); diff --git a/www/manager6/form/PCISelector.js b/www/manager6/form/PCISelector.js index c6847b67..7a4fa590 100644 --- a/www/manager6/form/PCISelector.js +++ b/www/manager6/form/PCISelector.js @@ -3,14 +3,14 @@ Ext.define('PVE.form.PCISelector', { xtype: 'pvePCISelector', store: { - fields: [ 'id','vendor_name', 'device_name', 'vendor', 'device', 'iommugroup', 'mdev' ], + fields: [ 'id', 'vendor_name', 'device_name', 'vendor', 'device', 'iommugroup', 'mdev' ], filterOnLoad: true, sorters: [ { property : 'id', - direction: 'ASC' - } - ] + direction: 'ASC', + }, + ], }, autoSelect: false, @@ -27,22 +27,22 @@ Ext.define('PVE.form.PCISelector', { { header: 'ID', dataIndex: 'id', - width: 100 + width: 100, }, { header: gettext('IOMMU Group'), dataIndex: 'iommugroup', - width: 50 + width: 50, }, { header: gettext('Vendor'), dataIndex: 'vendor_name', - flex: 2 + flex: 2, }, { header: gettext('Device'), dataIndex: 'device_name', - flex: 6 + flex: 6, }, { header: gettext('Mediated Devices'), @@ -50,9 +50,9 @@ Ext.define('PVE.form.PCISelector', { flex: 1, renderer: function(val) { return Proxmox.Utils.format_boolean(!!val); - } - } - ] + }, + }, + ], }, setNodename: function(nodename) { @@ -66,7 +66,7 @@ Ext.define('PVE.form.PCISelector', { me.store.setProxy({ type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/hardware/pci' + url: '/api2/json/nodes/' + me.nodename + '/hardware/pci', }); me.store.load(); @@ -85,6 +85,6 @@ Ext.define('PVE.form.PCISelector', { } me.setNodename(nodename); - } + }, }); diff --git a/www/manager6/form/PermPathSelector.js b/www/manager6/form/PermPathSelector.js index b0376618..c20d8b65 100644 --- a/www/manager6/form/PermPathSelector.js +++ b/www/manager6/form/PermPathSelector.js @@ -8,6 +8,6 @@ Ext.define('PVE.form.PermPathSelector', { queryMode: 'local', store: { - type: 'pvePermPath' - } + type: 'pvePermPath', + }, }); diff --git a/www/manager6/form/PoolSelector.js b/www/manager6/form/PoolSelector.js index 80a42b40..4e70b10d 100644 --- a/www/manager6/form/PoolSelector.js +++ b/www/manager6/form/PoolSelector.js @@ -11,7 +11,7 @@ Ext.define('PVE.form.PoolSelector', { var store = new Ext.data.Store({ model: 'pve-pools', - sorters: 'poolid' + sorters: 'poolid', }); Ext.apply(me, { @@ -23,23 +23,23 @@ Ext.define('PVE.form.PoolSelector', { header: gettext('Pool'), sortable: true, dataIndex: 'poolid', - flex: 1 + flex: 1, }, { header: gettext('Comment'), sortable: false, dataIndex: 'comment', renderer: Ext.String.htmlEncode, - flex: 1 - } - ] - } + flex: 1, + }, + ], + }, }); me.callParent(); store.load(); - } + }, }, function() { @@ -48,9 +48,9 @@ Ext.define('PVE.form.PoolSelector', { fields: [ 'poolid', 'comment' ], proxy: { type: 'proxmox', - url: "/api2/json/pools" + url: "/api2/json/pools", }, - idProperty: 'poolid' + idProperty: 'poolid', }); }); diff --git a/www/manager6/form/PrivilegesSelector.js b/www/manager6/form/PrivilegesSelector.js index a98ec426..8a84d473 100644 --- a/www/manager6/form/PrivilegesSelector.js +++ b/www/manager6/form/PrivilegesSelector.js @@ -23,13 +23,13 @@ Ext.define('PVE.form.PrivilegesSelector', { me.store.sort({ property: 'key', - direction: 'ASC' + direction: 'ASC', }); }, failure: function (response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); - } + }, }); diff --git a/www/manager6/form/QemuBiosSelector.js b/www/manager6/form/QemuBiosSelector.js index 74ecc8d2..f9d047c0 100644 --- a/www/manager6/form/QemuBiosSelector.js +++ b/www/manager6/form/QemuBiosSelector.js @@ -8,9 +8,9 @@ Ext.define('PVE.form.QemuBiosSelector', { me.comboItems = [ ['__default__', PVE.Utils.render_qemu_bios('')], ['seabios', PVE.Utils.render_qemu_bios('seabios')], - ['ovmf', PVE.Utils.render_qemu_bios('ovmf')] + ['ovmf', PVE.Utils.render_qemu_bios('ovmf')], ]; me.callParent(); - } + }, }); diff --git a/www/manager6/form/SDNControllerSelector.js b/www/manager6/form/SDNControllerSelector.js index 81ba0f16..f57b15e3 100644 --- a/www/manager6/form/SDNControllerSelector.js +++ b/www/manager6/form/SDNControllerSelector.js @@ -13,7 +13,7 @@ Ext.define('PVE.form.SDNControllerSelector', { model: 'pve-sdn-controller', sorters: { property: 'controller', - order: 'DESC' + order: 'DESC', }, }); @@ -26,16 +26,16 @@ Ext.define('PVE.form.SDNControllerSelector', { header: gettext('Controller'), sortable: true, dataIndex: 'controller', - flex: 1 + flex: 1, }, - ] - } + ], + }, }); me.callParent(); store.load(); - } + }, }, function() { @@ -44,9 +44,9 @@ Ext.define('PVE.form.SDNControllerSelector', { fields: [ 'controller' ], proxy: { type: 'proxmox', - url: "/api2/json/cluster/sdn/controllers" + url: "/api2/json/cluster/sdn/controllers", }, - idProperty: 'controller' + idProperty: 'controller', }); }); diff --git a/www/manager6/form/SDNZoneSelector.js b/www/manager6/form/SDNZoneSelector.js index da5804ec..b4e0d9ea 100644 --- a/www/manager6/form/SDNZoneSelector.js +++ b/www/manager6/form/SDNZoneSelector.js @@ -13,7 +13,7 @@ Ext.define('PVE.form.SDNZoneSelector', { model: 'pve-sdn-zone', sorters: { property: 'zone', - order: 'DESC' + order: 'DESC', }, }); @@ -26,16 +26,16 @@ Ext.define('PVE.form.SDNZoneSelector', { header: gettext('Zone'), sortable: true, dataIndex: 'zone', - flex: 1 + flex: 1, }, - ] - } + ], + }, }); me.callParent(); store.load(); - } + }, }, function() { @@ -44,9 +44,9 @@ Ext.define('PVE.form.SDNZoneSelector', { fields: [ 'zone' ], proxy: { type: 'proxmox', - url: "/api2/json/cluster/sdn/zones" + url: "/api2/json/cluster/sdn/zones", }, - idProperty: 'zone' + idProperty: 'zone', }); }); diff --git a/www/manager6/form/ScsiHwSelector.js b/www/manager6/form/ScsiHwSelector.js index f733a011..fd23158b 100644 --- a/www/manager6/form/ScsiHwSelector.js +++ b/www/manager6/form/ScsiHwSelector.js @@ -8,6 +8,6 @@ Ext.define('PVE.form.ScsiHwSelector', { ['megasas', PVE.Utils.render_scsihw('megasas')], ['virtio-scsi-pci', PVE.Utils.render_scsihw('virtio-scsi-pci')], ['virtio-scsi-single', PVE.Utils.render_scsihw('virtio-scsi-single')], - ['pvscsi', PVE.Utils.render_scsihw('pvscsi')] - ] + ['pvscsi', PVE.Utils.render_scsihw('pvscsi')], + ], }); diff --git a/www/manager6/form/SecurityGroupSelector.js b/www/manager6/form/SecurityGroupSelector.js index 6867a7e6..83db8b66 100644 --- a/www/manager6/form/SecurityGroupSelector.js +++ b/www/manager6/form/SecurityGroupSelector.js @@ -13,12 +13,12 @@ Ext.define('PVE.form.SecurityGroupsSelector', { idProperty: 'group', proxy: { type: 'proxmox', - url: "/api2/json/cluster/firewall/groups" + url: "/api2/json/cluster/firewall/groups", }, sorters: { property: 'group', - order: 'DESC' - } + order: 'DESC', + }, }); Ext.apply(me, { @@ -29,19 +29,19 @@ Ext.define('PVE.form.SecurityGroupsSelector', { header: gettext('Security Group'), dataIndex: 'group', hideable: false, - width: 100 + width: 100, }, { header: gettext('Comment'), dataIndex: 'comment', renderer: Ext.String.htmlEncode, - flex: 1 - } - ] - } + flex: 1, + }, + ], + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/form/SnapshotSelector.js b/www/manager6/form/SnapshotSelector.js index 96ee08c7..8c9e9217 100644 --- a/www/manager6/form/SnapshotSelector.js +++ b/www/manager6/form/SnapshotSelector.js @@ -22,7 +22,7 @@ Ext.define('PVE.form.SnapshotSelector', { me.store.setProxy({ type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/' + me.guestType + '/' + me.vmid +'/snapshot' + url: '/api2/json/nodes/' + me.nodename + '/' + me.guestType + '/' + me.vmid +'/snapshot', }); me.store.load(); @@ -45,7 +45,7 @@ Ext.define('PVE.form.SnapshotSelector', { var store = Ext.create('Ext.data.Store', { fields: [ 'name'], - filterOnLoad: true + filterOnLoad: true, }); Ext.apply(me, { @@ -56,14 +56,14 @@ Ext.define('PVE.form.SnapshotSelector', { header: gettext('Snapshot'), dataIndex: 'name', hideable: false, - flex: 1 - } - ] - } + flex: 1, + }, + ], + }, }); me.callParent(); me.loadStore(me.nodename, me.vmid); - } + }, }); diff --git a/www/manager6/form/SpiceEnhancementSelector.js b/www/manager6/form/SpiceEnhancementSelector.js index d4091996..41854208 100644 --- a/www/manager6/form/SpiceEnhancementSelector.js +++ b/www/manager6/form/SpiceEnhancementSelector.js @@ -39,8 +39,8 @@ Ext.define('PVE.form.SpiceEnhancementSelector', { value: gettext('Make sure the SPICE WebDav daemon is installed in the VM.'), bind: { hidden: '{!foldersharing.checked}', - } - } + }, + }, ], onGetValues: function(values) { diff --git a/www/manager6/form/StorageSelector.js b/www/manager6/form/StorageSelector.js index 8b1a8bd5..b1f2d0c5 100644 --- a/www/manager6/form/StorageSelector.js +++ b/www/manager6/form/StorageSelector.js @@ -12,26 +12,26 @@ Ext.define('PVE.form.StorageSelector', { header: gettext('Name'), dataIndex: 'storage', hideable: false, - flex: 1 + flex: 1, }, { header: gettext('Type'), width: 75, - dataIndex: 'type' + dataIndex: 'type', }, { header: gettext('Avail'), width: 90, dataIndex: 'avail', - renderer: Proxmox.Utils.format_size + renderer: Proxmox.Utils.format_size, }, { header: gettext('Capacity'), width: 90, dataIndex: 'total', - renderer: Proxmox.Utils.format_size - } - ] + renderer: Proxmox.Utils.format_size, + }, + ], }, reloadStorageList: function() { @@ -41,7 +41,7 @@ Ext.define('PVE.form.StorageSelector', { } var params = { - format: 1 + format: 1, }; var url = '/api2/json/nodes/' + me.nodename + '/storage'; if (me.storageContent) { @@ -54,7 +54,7 @@ Ext.define('PVE.form.StorageSelector', { me.store.setProxy({ type: 'proxmox', url: url, - extraParams: params + extraParams: params, }); me.store.load(); @@ -95,12 +95,12 @@ Ext.define('PVE.form.StorageSelector', { model: 'pve-storage-status', sorters: { property: 'storage', - order: 'DESC' - } + order: 'DESC', + }, }); Ext.apply(me, { - store: store + store: store, }); me.callParent(); @@ -108,13 +108,13 @@ Ext.define('PVE.form.StorageSelector', { if (nodename) { me.setNodename(nodename); } - } + }, }, function() { Ext.define('pve-storage-status', { extend: 'Ext.data.Model', fields: [ 'storage', 'active', 'type', 'avail', 'total' ], - idProperty: 'storage' + idProperty: 'storage', }); }); diff --git a/www/manager6/form/TokenSelector.js b/www/manager6/form/TokenSelector.js index bad829d2..6dfca2f7 100644 --- a/www/manager6/form/TokenSelector.js +++ b/www/manager6/form/TokenSelector.js @@ -45,16 +45,16 @@ Ext.define('PVE.form.TokenSelector', { sortable: true, dataIndex: 'id', renderer: Ext.String.htmlEncode, - flex: 1 + flex: 1, }, { header: gettext('Comment'), sortable: false, dataIndex: 'comment', renderer: Ext.String.htmlEncode, - flex: 1 - } - ] + flex: 1, + }, + ], }, }, function() { Ext.define('pve-tokens', { @@ -62,8 +62,8 @@ Ext.define('PVE.form.TokenSelector', { fields: [ 'id', 'userid', 'tokenid', 'comment', { type: 'boolean', name: 'privsep' }, - { type: 'date', dateFormat: 'timestamp', name: 'expire' } + { type: 'date', dateFormat: 'timestamp', name: 'expire' }, ], - idProperty: 'id' + idProperty: 'id', }); }); diff --git a/www/manager6/form/USBSelector.js b/www/manager6/form/USBSelector.js index b53880f6..4dcfe39a 100644 --- a/www/manager6/form/USBSelector.js +++ b/www/manager6/form/USBSelector.js @@ -45,8 +45,8 @@ Ext.define('PVE.form.USBSelector', { filters: [ function (item) { return !!item.data.usbpath && !!item.data.prodid && item.data['class'] != 9; - } - ] + }, + ], }); let emptyText = ''; if (me.type === 'device') { @@ -65,19 +65,19 @@ Ext.define('PVE.form.USBSelector', { header: (me.type === 'device')?gettext('Device'):gettext('Port'), sortable: true, dataIndex: 'usbid', - width: 80 + width: 80, }, { header: gettext('Manufacturer'), sortable: true, dataIndex: 'manufacturer', - width: 150 + width: 150, }, { header: gettext('Product'), sortable: true, dataIndex: 'product', - flex: 1 + flex: 1, }, { header: gettext('Speed'), @@ -93,16 +93,16 @@ Ext.define('PVE.form.USBSelector', { "1.5": "USB 1.x", }; return speed_map[value] || value + " Mbps"; - } - } - ] + }, + }, + ], }, }); me.callParent(); store.load(); - } + }, }, function() { @@ -116,14 +116,14 @@ Ext.define('PVE.form.USBSelector', { return val; } return data.get('vendid') + ':' + data.get('prodid'); - } + }, }, 'speed', 'product', 'manufacturer', 'vendid', 'prodid', 'usbpath', - { name: 'port' , type: 'number' }, - { name: 'level' , type: 'number' }, - { name: 'class' , type: 'number' }, - { name: 'devnum' , type: 'number' }, - { name: 'busnum' , type: 'number' }, + { name: 'port', type: 'number' }, + { name: 'level', type: 'number' }, + { name: 'class', type: 'number' }, + { name: 'devnum', type: 'number' }, + { name: 'busnum', type: 'number' }, { name: 'product_and_id', type: 'string', @@ -133,7 +133,7 @@ Ext.define('PVE.form.USBSelector', { return res; }, }, - ] + ], }); Ext.define('pve-usb-port', { @@ -141,19 +141,19 @@ Ext.define('PVE.form.USBSelector', { fields: [ { name: 'usbid', - convert: function(val,data) { + convert: function(val, data) { if (val) { return val; } return data.get('busnum') + '-' + data.get('usbpath'); - } + }, }, 'speed', 'product', 'manufacturer', 'vendid', 'prodid', 'usbpath', - { name: 'port' , type: 'number' }, - { name: 'level' , type: 'number' }, - { name: 'class' , type: 'number' }, - { name: 'devnum' , type: 'number' }, - { name: 'busnum' , type: 'number' }, + { name: 'port', type: 'number' }, + { name: 'level', type: 'number' }, + { name: 'class', type: 'number' }, + { name: 'devnum', type: 'number' }, + { name: 'busnum', type: 'number' }, { name: 'product_and_id', type: 'string', @@ -163,6 +163,6 @@ Ext.define('PVE.form.USBSelector', { return res; }, }, - ] + ], }); }); diff --git a/www/manager6/form/UserSelector.js b/www/manager6/form/UserSelector.js index 8f6f9fa4..f30a346c 100644 --- a/www/manager6/form/UserSelector.js +++ b/www/manager6/form/UserSelector.js @@ -17,8 +17,8 @@ Ext.define('PVE.form.UserSelector', { var store = new Ext.data.Store({ model: 'pve-users', sorters: [{ - property: 'userid' - }] + property: 'userid', + }], }); Ext.apply(me, { @@ -30,45 +30,45 @@ Ext.define('PVE.form.UserSelector', { sortable: true, dataIndex: 'userid', renderer: Ext.String.htmlEncode, - flex: 1 + flex: 1, }, { header: gettext('Name'), sortable: true, renderer: PVE.Utils.render_full_name, dataIndex: 'firstname', - flex: 1 + flex: 1, }, { header: gettext('Comment'), sortable: false, dataIndex: 'comment', renderer: Ext.String.htmlEncode, - flex: 1 - } - ] - } + flex: 1, + }, + ], + }, }); me.callParent(); store.load({ params: { enabled: 1 }}); - } + }, }, function() { Ext.define('pve-users', { extend: 'Ext.data.Model', fields: [ - 'userid', 'firstname', 'lastname' , 'email', 'comment', + 'userid', 'firstname', 'lastname', 'email', 'comment', { type: 'boolean', name: 'enable' }, - { type: 'date', dateFormat: 'timestamp', name: 'expire' } + { type: 'date', dateFormat: 'timestamp', name: 'expire' }, ], proxy: { type: 'proxmox', - url: "/api2/json/access/users" + url: "/api2/json/access/users", }, - idProperty: 'userid' + idProperty: 'userid', }); }); diff --git a/www/manager6/form/VLanField.js b/www/manager6/form/VLanField.js index 4898b728..07105dc5 100644 --- a/www/manager6/form/VLanField.js +++ b/www/manager6/form/VLanField.js @@ -32,9 +32,9 @@ Ext.define('PVE.form.VlanField', { Ext.apply(me, { minValue: 1, - maxValue: 4094 + maxValue: 4094, }); me.callParent(); - } + }, }); diff --git a/www/manager6/form/VMCPUFlagSelector.js b/www/manager6/form/VMCPUFlagSelector.js index 71aa7ad7..06760ef3 100644 --- a/www/manager6/form/VMCPUFlagSelector.js +++ b/www/manager6/form/VMCPUFlagSelector.js @@ -3,7 +3,7 @@ Ext.define('PVE.form.VMCPUFlagSelector', { alias: 'widget.vmcpuflagselector', mixins: { - field: 'Ext.form.field.Field' + field: 'Ext.form.field.Field', }, disableSelection: true, @@ -32,13 +32,13 @@ Ext.define('PVE.form.VMCPUFlagSelector', { { flag: 'pdpe1gb', desc: 'Allow guest OS to use 1GB size pages, if host HW supports it' }, { flag: 'hv-tlbflush', desc: 'Improve performance in overcommitted Windows guests. May lead to guest bluescreens on old CPUs.' }, { flag: 'hv-evmcs', desc: 'Improve performance for nested virtualization. Only supported on Intel CPUs.' }, - { flag: 'aes', desc: 'Activate AES instruction set for HW acceleration.' } + { flag: 'aes', desc: 'Activate AES instruction set for HW acceleration.' }, ], listeners: { update: function() { this.commitChanges(); - } - } + }, + }, }, getValue: function() { @@ -105,7 +105,7 @@ Ext.define('PVE.form.VMCPUFlagSelector', { default: return 'Unknown'; } }, - width: 65 + width: 65, }, { xtype: 'widgetcolumn', @@ -131,34 +131,34 @@ Ext.define('PVE.form.VMCPUFlagSelector', { view.dirty = view.getValue() !== view.originalValue; view.checkDirty(); //view.checkChange(); - } + }, }, items: [ { boxLabel: '-', boxLabelAlign: 'before', - inputValue: '-' + inputValue: '-', }, { checked: true, - inputValue: '=' + inputValue: '=', }, { boxLabel: '+', - inputValue: '+' - } - ] - } + inputValue: '+', + }, + ], + }, }, { dataIndex: 'flag', - width: 100 + width: 100, }, { dataIndex: 'desc', cellWrap: true, - flex: 1 - } + flex: 1, + }, ], initComponent: function() { @@ -172,5 +172,5 @@ Ext.define('PVE.form.VMCPUFlagSelector', { me.value = me.originalValue = ''; me.callParent(arguments); - } + }, }); diff --git a/www/manager6/form/VMSelector.js b/www/manager6/form/VMSelector.js index 03a46b0f..7aca5613 100644 --- a/www/manager6/form/VMSelector.js +++ b/www/manager6/form/VMSelector.js @@ -4,7 +4,7 @@ Ext.define('PVE.form.VMSelector', { alias: 'widget.vmselector', mixins: { - field: 'Ext.form.field.Field' + field: 'Ext.form.field.Field', }, allowBlank: true, @@ -19,8 +19,8 @@ Ext.define('PVE.form.VMSelector', { sorters: 'vmid', filters: [{ property: 'type', - value: /lxc|qemu/ - }] + value: /lxc|qemu/, + }], }, columns: [ { @@ -28,34 +28,34 @@ Ext.define('PVE.form.VMSelector', { dataIndex: 'vmid', width: 80, filter: { - type: 'number' - } + type: 'number', + }, }, { header: gettext('Node'), - dataIndex: 'node' + dataIndex: 'node', }, { header: gettext('Status'), dataIndex: 'status', filter: { - type: 'list' - } + type: 'list', + }, }, { header: gettext('Name'), dataIndex: 'name', flex: 1, filter: { - type: 'string' - } + type: 'string', + }, }, { header: gettext('Pool'), dataIndex: 'pool', filter: { - type: 'list' - } + type: 'list', + }, }, { header: gettext('Type'), @@ -75,41 +75,41 @@ Ext.define('PVE.form.VMSelector', { store: { data: [ {id: 'qemu', text: gettext('Virtual Machine')}, - {id: 'lxc', text: gettext('LXC Container')} + {id: 'lxc', text: gettext('LXC Container')}, ], // due to EXTJS-18711 // we have to do a static list via a store // but to avoid creating an object, // we have to have a pseudo un function - un: function(){} - } - } + un: function(){}, + }, + }, }, { header: 'HA ' + gettext('Status'), dataIndex: 'hastate', flex: 1, filter: { - type: 'list' - } - } + type: 'list', + }, + }, ], selModel: { selType: 'checkboxmodel', - mode: 'SIMPLE' + mode: 'SIMPLE', }, checkChangeEvents: [ 'selectionchange', - 'change' + 'change', ], listeners: { selectionchange: function() { // to trigger validity and error checks this.checkChange(); - } + }, }, getValue: function() { @@ -138,7 +138,7 @@ Ext.define('PVE.form.VMSelector', { var store = me.getStore(); value.forEach(function(item) { - var rec = store.findRecord('vmid',item, 0, false, true, true); + var rec = store.findRecord('vmid', item, 0, false, true, true); console.log(store); if (rec) { @@ -156,11 +156,11 @@ Ext.define('PVE.form.VMSelector', { var me = this; if (me.allowBlank === false && me.getSelectionModel().getCount() === 0) { - me.addBodyCls(['x-form-trigger-wrap-default','x-form-trigger-wrap-invalid']); + me.addBodyCls(['x-form-trigger-wrap-default', 'x-form-trigger-wrap-invalid']); return [gettext('No VM selected')]; } - me.removeBodyCls(['x-form-trigger-wrap-default','x-form-trigger-wrap-invalid']); + me.removeBodyCls(['x-form-trigger-wrap-default', 'x-form-trigger-wrap-invalid']); return []; }, @@ -173,7 +173,7 @@ Ext.define('PVE.form.VMSelector', { me.store.filters.add({ property: 'node', exactMatch: true, - value: me.nodename + value: me.nodename, }); } @@ -191,12 +191,12 @@ Ext.define('PVE.form.VMSelector', { if (statusfilter !== '') { me.store.filters.add({ property: 'template', - value: 0 - },{ + value: 0, + }, { id: 'x-gridfilter-status', operator: 'in', property: 'status', - value: [statusfilter] + value: [statusfilter], }); } } @@ -205,11 +205,11 @@ Ext.define('PVE.form.VMSelector', { var sm = me.getSelectionModel(); if (me.selectAll) { - me.mon(store,'load', function(){ + me.mon(store, 'load', function(){ me.getSelectionModel().selectAll(false); }); } - } + }, }); @@ -231,8 +231,8 @@ Ext.define('PVE.form.VMComboSelector', { sorters: 'vmid', filters: [{ property: 'type', - value: /lxc|qemu/ - }] + value: /lxc|qemu/, + }], }, listConfig: { @@ -244,35 +244,35 @@ Ext.define('PVE.form.VMComboSelector', { dataIndex: 'vmid', width: 80, filter: { - type: 'number' - } + type: 'number', + }, }, { header: gettext('Name'), dataIndex: 'name', flex: 1, filter: { - type: 'string' - } + type: 'string', + }, }, { header: gettext('Node'), - dataIndex: 'node' + dataIndex: 'node', }, { header: gettext('Status'), dataIndex: 'status', filter: { - type: 'list' - } + type: 'list', + }, }, { header: gettext('Pool'), dataIndex: 'pool', hidden: true, filter: { - type: 'list' - } + type: 'list', + }, }, { header: gettext('Type'), @@ -292,11 +292,11 @@ Ext.define('PVE.form.VMComboSelector', { store: { data: [ {id: 'qemu', text: gettext('Virtual Machine')}, - {id: 'lxc', text: gettext('LXC Container')} + {id: 'lxc', text: gettext('LXC Container')}, ], - un: function(){} // due to EXTJS-18711 - } - } + un: function(){}, // due to EXTJS-18711 + }, + }, }, { header: 'HA ' + gettext('Status'), @@ -304,9 +304,9 @@ Ext.define('PVE.form.VMComboSelector', { hidden: true, flex: 1, filter: { - type: 'list' - } - } - ] - } + type: 'list', + }, + }, + ], + }, }); diff --git a/www/manager6/form/VNCKeyboardSelector.js b/www/manager6/form/VNCKeyboardSelector.js index 5758438f..6d6e4783 100644 --- a/www/manager6/form/VNCKeyboardSelector.js +++ b/www/manager6/form/VNCKeyboardSelector.js @@ -1,5 +1,5 @@ Ext.define('PVE.form.VNCKeyboardSelector', { extend: 'Proxmox.form.KVComboBox', alias: ['widget.VNCKeyboardSelector'], - comboItems: PVE.Utils.kvm_keymap_array() + comboItems: PVE.Utils.kvm_keymap_array(), }); diff --git a/www/manager6/form/ViewSelector.js b/www/manager6/form/ViewSelector.js index fd0b536d..7d92c7b0 100644 --- a/www/manager6/form/ViewSelector.js +++ b/www/manager6/form/ViewSelector.js @@ -20,18 +20,18 @@ Ext.define('PVE.form.ViewSelector', { var default_views = { server: { text: gettext('Server View'), - groups: ['node'] + groups: ['node'], }, folder: { text: gettext('Folder View'), - groups: ['type'] + groups: ['type'], }, storage: { text: gettext('Storage View'), groups: ['node'], filterfn: function(node) { return node.data.type === 'storage' || node.data.type === 'node'; - } + }, }, pool: { text: gettext('Pool View'), @@ -40,8 +40,8 @@ Ext.define('PVE.form.ViewSelector', { filterfn: function(node) { return node.data.type === 'qemu' || node.data.type === 'lxc' || node.data.type === 'openvz' || node.data.type === 'pool'; - } - } + }, + }, }; var groupdef = []; @@ -53,10 +53,10 @@ Ext.define('PVE.form.ViewSelector', { model: 'KeyValue', proxy: { type: 'memory', - reader: 'array' + reader: 'array', }, data: groupdef, - autoload: true + autoload: true, }); Ext.apply(me, { @@ -86,7 +86,7 @@ Ext.define('PVE.form.ViewSelector', { stateEvents: [ 'select' ], stateful: true, stateId: 'pveview', - id: 'view' + id: 'view', }); me.callParent(); @@ -99,5 +99,5 @@ Ext.define('PVE.form.ViewSelector', { var sp = Ext.state.Manager.getProvider(); me.mon(sp, 'statechange', statechange, me); - } + }, }); diff --git a/www/manager6/form/iScsiProviderSelector.js b/www/manager6/form/iScsiProviderSelector.js index 5d10c1b7..c7129f8b 100644 --- a/www/manager6/form/iScsiProviderSelector.js +++ b/www/manager6/form/iScsiProviderSelector.js @@ -5,6 +5,6 @@ Ext.define('PVE.form.iScsiProviderSelector', { ['comstar', 'Comstar'], [ 'istgt', 'istgt'], [ 'iet', 'IET'], - [ 'LIO', 'LIO'] - ] + [ 'LIO', 'LIO'], + ], }); diff --git a/www/manager6/grid/BackupView.js b/www/manager6/grid/BackupView.js index f1acba34..d7036abd 100644 --- a/www/manager6/grid/BackupView.js +++ b/www/manager6/grid/BackupView.js @@ -43,7 +43,7 @@ Ext.define('PVE.grid.BackupView', { property: 'volid', value: '', anyMatch: true, - caseSensitive: false + caseSensitive: false, }; var vmidFilter = { @@ -56,13 +56,13 @@ Ext.define('PVE.grid.BackupView', { model: 'pve-storage-content', sorters: { property: 'volid', - order: 'DESC' + order: 'DESC', }, filters: [ vmtypeFilter, searchFilter, vmidFilter, - ] + ], }); let updateFilter = function() { @@ -85,7 +85,7 @@ Ext.define('PVE.grid.BackupView', { me.store.setProxy({ type: 'proxmox', - url: url + url: url, }); reload(); @@ -110,8 +110,8 @@ Ext.define('PVE.grid.BackupView', { }); } setStorage(value); - } - } + }, + }, }); var storagefilter = Ext.create('Ext.form.field.Text', { @@ -126,8 +126,8 @@ Ext.define('PVE.grid.BackupView', { me.store.clearFilter(true); searchFilter.value = field.getValue(); updateFilter(); - } - } + }, + }, }); var vmidfilterCB = Ext.create('Ext.form.field.Checkbox', { @@ -155,11 +155,11 @@ Ext.define('PVE.grid.BackupView', { listeners : { close: function() { reload(); - } - } + }, + }, }); win.show(); - } + }, }); var restore_btn = Ext.create('Proxmox.button.Button', { @@ -175,11 +175,11 @@ Ext.define('PVE.grid.BackupView', { vmid: vmid, volid: rec.data.volid, volidText: PVE.Utils.render_storage_content(rec.data.volid, {}, rec), - vmtype: vmtype + vmtype: vmtype, }); win.show(); win.on('destroy', reload); - } + }, }); var delete_btn = Ext.create('Proxmox.button.StdRemoveButton', { @@ -199,7 +199,7 @@ Ext.define('PVE.grid.BackupView', { }, callback: function() { reload(); - } + }, }); var config_btn = Ext.create('Proxmox.button.Button', { @@ -217,11 +217,11 @@ Ext.define('PVE.grid.BackupView', { var win = Ext.create('PVE.window.BackupConfig', { volume: rec.data.volid, - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); win.show(); - } + }, }); Ext.apply(me, { @@ -278,7 +278,7 @@ Ext.define('PVE.grid.BackupView', { storagesel, '-', vmidfilterCB, - storagefilter + storagefilter, ], }, columns: [ @@ -287,7 +287,7 @@ Ext.define('PVE.grid.BackupView', { flex: 2, sortable: true, renderer: PVE.Utils.render_storage_content, - dataIndex: 'volid' + dataIndex: 'volid', }, { header: gettext('Notes'), @@ -298,18 +298,18 @@ Ext.define('PVE.grid.BackupView', { { header: gettext('Date'), width: 150, - dataIndex: 'vdate' + dataIndex: 'vdate', }, { header: gettext('Format'), width: 100, - dataIndex: 'format' + dataIndex: 'format', }, { header: gettext('Size'), width: 100, renderer: Proxmox.Utils.format_size, - dataIndex: 'size' + dataIndex: 'size', }, { header: gettext('VMID'), @@ -325,10 +325,10 @@ Ext.define('PVE.grid.BackupView', { header: gettext('Verify State'), dataIndex: 'verification', renderer: PVE.Utils.render_backup_verification, - } - ] + }, + ], }); me.callParent(); - } + }, }); diff --git a/www/manager6/grid/FirewallAliases.js b/www/manager6/grid/FirewallAliases.js index 40bfe357..16690304 100644 --- a/www/manager6/grid/FirewallAliases.js +++ b/www/manager6/grid/FirewallAliases.js @@ -26,30 +26,30 @@ Ext.define('PVE.FirewallAliasEdit', { xtype: 'textfield', name: me.isCreate ? 'name' : 'rename', fieldLabel: gettext('Name'), - allowBlank: false + allowBlank: false, }, { xtype: 'textfield', name: 'cidr', fieldLabel: gettext('IP/CIDR'), - allowBlank: false + allowBlank: false, }, { xtype: 'textfield', name: 'comment', - fieldLabel: gettext('Comment') - } + fieldLabel: gettext('Comment'), + }, ]; var ipanel = Ext.create('Proxmox.panel.InputPanel', { isCreate: me.isCreate, - items: items + items: items, }); Ext.apply(me, { subject: gettext('Alias'), isAdd: true, - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -60,17 +60,17 @@ Ext.define('PVE.FirewallAliasEdit', { var values = response.result.data; values.rename = values.name; ipanel.setValues(values); - } + }, }); } - } + }, }); Ext.define('pve-fw-aliases', { extend: 'Ext.data.Model', fields: [ 'name', 'cidr', 'comment', 'digest' ], - idProperty: 'name' + idProperty: 'name', }); Ext.define('PVE.FirewallAliases', { @@ -98,12 +98,12 @@ Ext.define('PVE.FirewallAliases', { model: 'pve-fw-aliases', proxy: { type: 'proxmox', - url: "/api2/json" + me.base_url + url: "/api2/json" + me.base_url, }, sorters: { property: 'name', - order: 'DESC' - } + order: 'DESC', + }, }); var sm = Ext.create('Ext.selection.RowModel', {}); @@ -129,7 +129,7 @@ Ext.define('PVE.FirewallAliases', { var win = Ext.create('PVE.FirewallAliasEdit', { base_url: me.base_url, - alias_name: rec.data.name + alias_name: rec.data.name, }); win.show(); @@ -140,24 +140,24 @@ Ext.define('PVE.FirewallAliases', { text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); me.addBtn = Ext.create('Ext.Button', { text: gettext('Add'), handler: function() { var win = Ext.create('PVE.FirewallAliasEdit', { - base_url: me.base_url + base_url: me.base_url, }); win.on('destroy', reload); win.show(); - } + }, }); me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', { selModel: sm, baseurl: me.base_url + '/', - callback: reload + callback: reload, }); @@ -181,14 +181,14 @@ Ext.define('PVE.FirewallAliases', { dataIndex: 'comment', renderer: Ext.String.htmlEncode, flex: 3, - } + }, ], listeners: { - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }); me.callParent(); me.on('activate', reload); - } + }, }); diff --git a/www/manager6/grid/FirewallOptions.js b/www/manager6/grid/FirewallOptions.js index 5a185098..e6088183 100644 --- a/www/manager6/grid/FirewallOptions.js +++ b/www/manager6/grid/FirewallOptions.js @@ -38,7 +38,7 @@ Ext.define('PVE.FirewallOptions', { } return value; - } + }, }); }; @@ -54,9 +54,9 @@ Ext.define('PVE.FirewallOptions', { items: { xtype: 'pveFirewallLogLevels', name: name, - fieldLabel: name - } - } + fieldLabel: name, + }, + }, }; }; @@ -68,8 +68,8 @@ Ext.define('PVE.FirewallOptions', { renderer: Proxmox.Utils.format_boolean, editor: { xtype: 'pveFirewallEnableEdit', - defaultValue: 1 - } + defaultValue: 1, + }, }; add_boolean_row('nosmurfs', gettext('SMURFS filter'), 1); add_boolean_row('tcpflags', gettext('TCP flags filter'), 0); @@ -89,8 +89,8 @@ Ext.define('PVE.FirewallOptions', { renderer: Proxmox.Utils.format_boolean, editor: { xtype: 'pveFirewallEnableEdit', - defaultValue: 0 - } + defaultValue: 0, + }, }; add_boolean_row('dhcp', 'DHCP', 1); add_boolean_row('ndp', 'NDP', 1); @@ -108,8 +108,8 @@ Ext.define('PVE.FirewallOptions', { defaultValue: gettext('Default') + ' (enable=1,rate1/second,burst=5)', editor: { xtype: 'pveFirewallLograteEdit', - defaultValue: 'enable=1' - } + defaultValue: 'enable=1', + }, }; } @@ -125,9 +125,9 @@ Ext.define('PVE.FirewallOptions', { xtype: 'pveFirewallPolicySelector', name: 'policy_in', value: 'DROP', - fieldLabel: gettext('Input Policy') - } - } + fieldLabel: gettext('Input Policy'), + }, + }, }; me.rows.policy_out = { @@ -141,16 +141,16 @@ Ext.define('PVE.FirewallOptions', { xtype: 'pveFirewallPolicySelector', name: 'policy_out', value: 'ACCEPT', - fieldLabel: gettext('Output Policy') - } - } + fieldLabel: gettext('Output Policy'), + }, + }, }; } var edit_btn = new Ext.Button({ text: gettext('Edit'), disabled: true, - handler: function() { me.run_editor(); } + handler: function() { me.run_editor(); }, }); var set_button_status = function() { @@ -169,12 +169,12 @@ Ext.define('PVE.FirewallOptions', { url: "/api2/json" + me.base_url, tbar: [ edit_btn ], editorConfig: { - url: '/api2/extjs/' + me.base_url + url: '/api2/extjs/' + me.base_url, }, listeners: { itemdblclick: me.run_editor, - selectionchange: set_button_status - } + selectionchange: set_button_status, + }, }); me.callParent(); @@ -182,7 +182,7 @@ Ext.define('PVE.FirewallOptions', { me.on('activate', me.rstore.startUpdate); me.on('destroy', me.rstore.stopUpdate); me.on('deactivate', me.rstore.stopUpdate); - } + }, }); @@ -195,5 +195,5 @@ Ext.define('PVE.FirewallLogLevels', { value: 'nolog', comboItems: [['nolog', 'nolog'], ['emerg', 'emerg'], ['alert', 'alert'], ['crit', 'crit'], ['err', 'err'], ['warning', 'warning'], - ['notice', 'notice'], ['info', 'info'], ['debug', 'debug']] + ['notice', 'notice'], ['info', 'info'], ['debug', 'debug']], }); diff --git a/www/manager6/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js index 57ff9eaf..af71ad63 100644 --- a/www/manager6/grid/FirewallRules.js +++ b/www/manager6/grid/FirewallRules.js @@ -11,15 +11,15 @@ Ext.define('PVE.form.FWMacroSelector', { header: gettext('Macro'), dataIndex: 'macro', hideable: false, - width: 100 + width: 100, }, { header: gettext('Description'), renderer: Ext.String.htmlEncode, flex: 1, - dataIndex: 'descr' - } - ] + dataIndex: 'descr', + }, + ], }, initComponent: function() { var me = this; @@ -30,20 +30,20 @@ Ext.define('PVE.form.FWMacroSelector', { idProperty: 'macro', proxy: { type: 'proxmox', - url: "/api2/json/cluster/firewall/macros" + url: "/api2/json/cluster/firewall/macros", }, sorters: { property: 'macro', - order: 'DESC' - } + order: 'DESC', + }, }); Ext.apply(me, { - store: store + store: store, }); me.callParent(); - } + }, }); Ext.define('PVE.FirewallRulePanel', { @@ -84,7 +84,7 @@ Ext.define('PVE.FirewallRulePanel', { // form again. xtype: 'hiddenfield', name: 'modified_marker', - value: '' + value: '', }, { xtype: 'proxmoxKVComboBox', @@ -92,7 +92,7 @@ Ext.define('PVE.FirewallRulePanel', { value: 'in', comboItems: [['in', 'in'], ['out', 'out']], fieldLabel: gettext('Direction'), - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxKVComboBox', @@ -100,8 +100,8 @@ Ext.define('PVE.FirewallRulePanel', { value: 'ACCEPT', comboItems: [['ACCEPT', 'ACCEPT'], ['DROP', 'DROP'], ['REJECT', 'REJECT']], fieldLabel: gettext('Action'), - allowBlank: false - } + allowBlank: false, + }, ]; if (me.allow_iface) { @@ -110,13 +110,13 @@ Ext.define('PVE.FirewallRulePanel', { name: 'iface', deleteEmpty: !me.isCreate, value: '', - fieldLabel: gettext('Interface') + fieldLabel: gettext('Interface'), }); } else { me.column1.push({ xtype: 'displayfield', fieldLabel: '', - value: '' + value: '', }); } @@ -125,7 +125,7 @@ Ext.define('PVE.FirewallRulePanel', { xtype: 'displayfield', fieldLabel: '', height: 7, - value: '' + value: '', }, { xtype: 'pveIPRefSelector', @@ -134,7 +134,7 @@ Ext.define('PVE.FirewallRulePanel', { editable: true, base_url: me.list_refs_url, value: '', - fieldLabel: gettext('Source') + fieldLabel: gettext('Source'), }, { @@ -144,8 +144,8 @@ Ext.define('PVE.FirewallRulePanel', { editable: true, base_url: me.list_refs_url, value: '', - fieldLabel: gettext('Destination') - } + fieldLabel: gettext('Destination'), + }, ); @@ -155,7 +155,7 @@ Ext.define('PVE.FirewallRulePanel', { name: 'enable', checked: false, uncheckedValue: 0, - fieldLabel: gettext('Enable') + fieldLabel: gettext('Enable'), }, { xtype: 'pveFWMacroSelector', @@ -177,8 +177,8 @@ Ext.define('PVE.FirewallRulePanel', { me.down('field[name=dport]').setDisabled(true); me.down('field[name=dport]').setValue(''); } - } - } + }, + }, }, { xtype: 'pveIPProtocolSelector', @@ -186,32 +186,32 @@ Ext.define('PVE.FirewallRulePanel', { autoSelect: false, editable: true, value: '', - fieldLabel: gettext('Protocol') + fieldLabel: gettext('Protocol'), }, { xtype: 'displayfield', fieldLabel: '', height: 7, - value: '' + value: '', }, { xtype: 'textfield', name: 'sport', value: '', - fieldLabel: gettext('Source port') + fieldLabel: gettext('Source port'), }, { xtype: 'textfield', name: 'dport', value: '', - fieldLabel: gettext('Dest. port') - } + fieldLabel: gettext('Dest. port'), + }, ]; me.advancedColumn1 = [ { - xtype: 'pveFirewallLogLevels' - } + xtype: 'pveFirewallLogLevels', + }, ]; me.columnB = [ @@ -219,12 +219,12 @@ Ext.define('PVE.FirewallRulePanel', { xtype: 'textfield', name: 'comment', value: '', - fieldLabel: gettext('Comment') - } + fieldLabel: gettext('Comment'), + }, ]; me.callParent(); - } + }, }); Ext.define('PVE.FirewallRuleEdit', { @@ -260,13 +260,13 @@ Ext.define('PVE.FirewallRuleEdit', { isCreate: me.isCreate, list_refs_url: me.list_refs_url, allow_iface: me.allow_iface, - rule_pos: me.rule_pos + rule_pos: me.rule_pos, }); Ext.apply(me, { subject: gettext('Rule'), isAdd: true, - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -284,12 +284,12 @@ Ext.define('PVE.FirewallRuleEdit', { form.markInvalid(values.errors); }, 100); } - } + }, }); } else if (me.rec) { ipanel.setValues(me.rec.data); } - } + }, }); Ext.define('PVE.FirewallGroupRuleEdit', { @@ -317,15 +317,15 @@ Ext.define('PVE.FirewallGroupRuleEdit', { { xtype: 'hiddenfield', name: 'type', - value: 'group' + value: 'group', }, { xtype: 'pveSecurityGroupsSelector', name: 'action', value: '', fieldLabel: gettext('Security Group'), - allowBlank: false - } + allowBlank: false, + }, ]; if (me.allow_iface) { @@ -334,7 +334,7 @@ Ext.define('PVE.FirewallGroupRuleEdit', { name: 'iface', deleteEmpty: !me.isCreate, value: '', - fieldLabel: gettext('Interface') + fieldLabel: gettext('Interface'), }); } @@ -347,23 +347,23 @@ Ext.define('PVE.FirewallGroupRuleEdit', { name: 'enable', checked: false, uncheckedValue: 0, - fieldLabel: gettext('Enable') - } + fieldLabel: gettext('Enable'), + }, ], columnB: [ { xtype: 'textfield', name: 'comment', value: '', - fieldLabel: gettext('Comment') - } - ] + fieldLabel: gettext('Comment'), + }, + ], }); Ext.apply(me, { subject: gettext('Rule'), isAdd: true, - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -373,10 +373,10 @@ Ext.define('PVE.FirewallGroupRuleEdit', { success: function(response, options) { var values = response.result.data; ipanel.setValues(values); - } + }, }); } - } + }, }); Ext.define('PVE.FirewallRules', { @@ -420,7 +420,7 @@ Ext.define('PVE.FirewallRules', { } me.store.setProxy({ type: 'proxmox', - url: '/api2/json' + url + url: '/api2/json' + url, }); me.store.load(); @@ -444,7 +444,7 @@ Ext.define('PVE.FirewallRules', { }, callback: function() { me.store.load(); - } + }, }); }, @@ -471,7 +471,7 @@ Ext.define('PVE.FirewallRules', { }, callback: function() { me.store.load(); - } + }, }); }, @@ -483,8 +483,8 @@ Ext.define('PVE.FirewallRules', { throw "no list_refs_url specified"; } - var store = Ext.create('Ext.data.Store',{ - model: 'pve-fw-rule' + var store = Ext.create('Ext.data.Store', { + model: 'pve-fw-rule', }); var reload = function() { @@ -514,18 +514,18 @@ Ext.define('PVE.FirewallRules', { allow_iface: me.allow_iface, base_url: me.base_url, list_refs_url: me.list_refs_url, - rule_pos: rec.data.pos + rule_pos: rec.data.pos, }); win.show(); win.on('destroy', reload); }; - me.editBtn = Ext.create('Proxmox.button.Button',{ + me.editBtn = Ext.create('Proxmox.button.Button', { text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); me.addBtn = Ext.create('Ext.Button', { @@ -535,11 +535,11 @@ Ext.define('PVE.FirewallRules', { var win = Ext.create('PVE.FirewallRuleEdit', { allow_iface: me.allow_iface, base_url: me.base_url, - list_refs_url: me.list_refs_url + list_refs_url: me.list_refs_url, }); win.on('destroy', reload); win.show(); - } + }, }); var run_copy_editor = function() { @@ -559,21 +559,21 @@ Ext.define('PVE.FirewallRules', { allow_iface: me.allow_iface, base_url: me.base_url, list_refs_url: me.list_refs_url, - rec: rec + rec: rec, }); win.show(); win.on('destroy', reload); }; - me.copyBtn = Ext.create('Proxmox.button.Button',{ + me.copyBtn = Ext.create('Proxmox.button.Button', { text: gettext('Copy'), selModel: sm, enableFn: function(rec) { return (rec.data.type === 'in' || rec.data.type === 'out'); }, disabled: true, - handler: run_copy_editor + handler: run_copy_editor, }); if (me.allow_groups) { @@ -584,15 +584,15 @@ Ext.define('PVE.FirewallRules', { handler: function() { var win = Ext.create('PVE.FirewallGroupRuleEdit', { allow_iface: me.allow_iface, - base_url: me.base_url + base_url: me.base_url, }); win.on('destroy', reload); win.show(); - } + }, }); } - me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton',{ + me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', { selModel: sm, baseurl: me.base_url + '/', confirmMsg: false, @@ -603,7 +603,7 @@ Ext.define('PVE.FirewallRules', { }, callback: function() { me.store.load(); - } + }, }); var tbar = me.tbar_prefix ? [ me.tbar_prefix ] : []; @@ -619,7 +619,7 @@ Ext.define('PVE.FirewallRules', { metaData.tdCls = 'proxmox-invalid-row'; var html = '

' + Ext.htmlEncode(errors[name]) + '

'; metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + - html.replace(/\"/g,'"') + '"'; + html.replace(/\"/g, '"') + '"'; } return value; }; @@ -640,7 +640,7 @@ Ext.define('PVE.FirewallRules', { return value; } return ''; - } + }, }, { xtype: 'checkcolumn', @@ -658,9 +658,9 @@ Ext.define('PVE.FirewallRules', { delete data.iface; } me.updateRule(data); - } + }, }, - width: 50 + width: 50, }, { header: gettext('Type'), @@ -668,7 +668,7 @@ Ext.define('PVE.FirewallRules', { renderer: function(value, metaData, record) { return render_errors('type', value, metaData, record); }, - width: 50 + width: 50, }, { header: gettext('Action'), @@ -676,7 +676,7 @@ Ext.define('PVE.FirewallRules', { renderer: function(value, metaData, record) { return render_errors('action', value, metaData, record); }, - width: 80 + width: 80, }, { header: gettext('Macro'), @@ -684,8 +684,8 @@ Ext.define('PVE.FirewallRules', { renderer: function(value, metaData, record) { return render_errors('macro', value, metaData, record); }, - width: 80 - } + width: 80, + }, ]; if (me.allow_iface) { @@ -695,7 +695,7 @@ Ext.define('PVE.FirewallRules', { renderer: function(value, metaData, record) { return render_errors('iface', value, metaData, record); }, - width: 80 + width: 80, }); } @@ -706,7 +706,7 @@ Ext.define('PVE.FirewallRules', { renderer: function(value, metaData, record) { return render_errors('source', value, metaData, record); }, - width: 100 + width: 100, }, { header: gettext('Destination'), @@ -714,7 +714,7 @@ Ext.define('PVE.FirewallRules', { renderer: function(value, metaData, record) { return render_errors('dest', value, metaData, record); }, - width: 100 + width: 100, }, { header: gettext('Protocol'), @@ -722,7 +722,7 @@ Ext.define('PVE.FirewallRules', { renderer: function(value, metaData, record) { return render_errors('proto', value, metaData, record); }, - width: 100 + width: 100, }, { header: gettext('Dest. port'), @@ -730,7 +730,7 @@ Ext.define('PVE.FirewallRules', { renderer: function(value, metaData, record) { return render_errors('dport', value, metaData, record); }, - width: 100 + width: 100, }, { header: gettext('Source port'), @@ -738,7 +738,7 @@ Ext.define('PVE.FirewallRules', { renderer: function(value, metaData, record) { return render_errors('sport', value, metaData, record); }, - width: 100 + width: 100, }, { header: gettext('Log level'), @@ -746,7 +746,7 @@ Ext.define('PVE.FirewallRules', { renderer: function(value, metaData, record) { return render_errors('log', value, metaData, record); }, - width: 100 + width: 100, }, { header: gettext('Comment'), @@ -754,8 +754,8 @@ Ext.define('PVE.FirewallRules', { flex: 1, renderer: function(value, metaData, record) { return render_errors('comment', Ext.util.Format.htmlEncode(value), metaData, record); - } - } + }, + }, ); Ext.apply(me, { @@ -767,8 +767,8 @@ Ext.define('PVE.FirewallRules', { { ptype: 'gridviewdragdrop', dragGroup: 'FWRuleDDGroup', - dropGroup: 'FWRuleDDGroup' - } + dropGroup: 'FWRuleDDGroup', + }, ], listeners: { beforedrop: function(node, data, dropRec, dropPosition) { @@ -783,11 +783,11 @@ Ext.define('PVE.FirewallRules', { me.moveRule(pos, moveto); return 0; }, - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }, sortableColumns: false, - columns: columns + columns: columns, }); me.callParent(); @@ -795,7 +795,7 @@ Ext.define('PVE.FirewallRules', { if (me.base_url) { me.setBaseUrl(me.base_url); // load } - } + }, }, function() { Ext.define('pve-fw-rule', { @@ -803,7 +803,7 @@ Ext.define('PVE.FirewallRules', { fields: [ { name: 'enable', type: 'boolean' }, 'type', 'action', 'macro', 'source', 'dest', 'proto', 'iface', 'dport', 'sport', 'comment', 'pos', 'digest', 'errors' ], - idProperty: 'pos' + idProperty: 'pos', }); }); diff --git a/www/manager6/grid/PoolMembers.js b/www/manager6/grid/PoolMembers.js index a452cc59..a20afc30 100644 --- a/www/manager6/grid/PoolMembers.js +++ b/www/manager6/grid/PoolMembers.js @@ -18,7 +18,7 @@ Ext.define('PVE.pool.AddVM', { var vmsField = Ext.create('Ext.form.field.Text', { name: 'vms', hidden: true, - allowBlank: false + allowBlank: false, }); var vmStore = Ext.create('Ext.data.Store', { @@ -26,17 +26,17 @@ Ext.define('PVE.pool.AddVM', { sorters: [ { property: 'vmid', - order: 'ASC' - } + order: 'ASC', + }, ], filters: [ function(item) { return ((item.data.type === 'lxc' || item.data.type === 'qemu') && item.data.pool === ''); - } - ] + }, + ], }); - var vmGrid = Ext.create('widget.grid',{ + var vmGrid = Ext.create('widget.grid', { store: vmStore, border: true, height: 300, @@ -51,18 +51,18 @@ Ext.define('PVE.pool.AddVM', { selectedVms.push(vm.data.vmid); }); vmsField.setValue(selectedVms); - } - } + }, + }, }, columns: [ { header: 'ID', dataIndex: 'vmid', - width: 60 + width: 60, }, { header: gettext('Node'), - dataIndex: 'node' + dataIndex: 'node', }, { header: gettext('Status'), @@ -73,27 +73,27 @@ Ext.define('PVE.pool.AddVM', { } else { return Proxmox.Utils.stoppedText; } - } + }, }, { header: gettext('Name'), dataIndex: 'name', - flex: 1 + flex: 1, }, { header: gettext('Type'), - dataIndex: 'type' - } - ] + dataIndex: 'type', + }, + ], }); Ext.apply(me, { subject: gettext('Virtual Machine'), - items: [ vmsField, vmGrid ] + items: [ vmsField, vmGrid ], }); me.callParent(); vmStore.load(); - } + }, }); Ext.define('PVE.pool.AddStorage', { @@ -122,13 +122,13 @@ Ext.define('PVE.pool.AddStorage', { nodename: 'localhost', autoSelect: false, value: '', - fieldLabel: gettext("Storage") - } - ] + fieldLabel: gettext("Storage"), + }, + ], }); me.callParent(); - } + }, }); Ext.define('PVE.grid.PoolMembers', { @@ -152,14 +152,14 @@ Ext.define('PVE.grid.PoolMembers', { sorters: [ { property : 'type', - direction: 'ASC' - } + direction: 'ASC', + }, ], proxy: { type: 'proxmox', root: 'data.members', - url: "/api2/json/pools/" + me.pool - } + url: "/api2/json/pools/" + me.pool, + }, }); var coldef = PVE.data.ResourceStore.defaultColumns(); @@ -198,9 +198,9 @@ Ext.define('PVE.grid.PoolMembers', { }, failure: function (response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); - } + }, }); Ext.apply(me, { @@ -218,7 +218,7 @@ Ext.define('PVE.grid.PoolMembers', { var win = Ext.create('PVE.pool.AddVM', { pool: me.pool }); win.on('destroy', reload); win.show(); - } + }, }, { text: gettext('Storage'), @@ -227,15 +227,15 @@ Ext.define('PVE.grid.PoolMembers', { var win = Ext.create('PVE.pool.AddStorage', { pool: me.pool }); win.on('destroy', reload); win.show(); - } - } - ] - }) + }, + }, + ], + }), }, - remove_btn + remove_btn, ], viewConfig: { - stripeRows: true + stripeRows: true, }, columns: coldef, listeners: { @@ -244,10 +244,10 @@ Ext.define('PVE.grid.PoolMembers', { var ws = me.up('pveStdWorkspace'); ws.selectById(record.data.id); }, - activate: reload - } + activate: reload, + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/grid/Replication.js b/www/manager6/grid/Replication.js index 19e67d90..4f4780b0 100644 --- a/www/manager6/grid/Replication.js +++ b/www/manager6/grid/Replication.js @@ -20,7 +20,7 @@ Ext.define('PVE.window.ReplicaEdit', { xtype: (me.isCreate && !vmid)?'pveGuestIDSelector':'displayfield', name: 'guest', fieldLabel: 'CT/VM ID', - value: vmid || '' + value: vmid || '', }); items.push( @@ -30,13 +30,13 @@ Ext.define('PVE.window.ReplicaEdit', { disallowedNodes: [nodename], allowBlank: false, onlineValidator: true, - fieldLabel: gettext("Target") + fieldLabel: gettext("Target"), }, { xtype: 'pveCalendarEvent', fieldLabel: gettext('Schedule'), emptyText: '*/15 - ' + Ext.String.format(gettext('Every {0} minutes'), 15), - name: 'schedule' + name: 'schedule', }, { xtype: 'numberfield', @@ -44,20 +44,20 @@ Ext.define('PVE.window.ReplicaEdit', { step: 1, minValue: 1, emptyText: gettext('unlimited'), - name: 'rate' + name: 'rate', }, { xtype: 'textfield', fieldLabel: gettext('Comment'), - name: 'comment' + name: 'comment', }, { xtype: 'proxmoxcheckbox', name: 'enabled', defaultValue: 'on', checked: true, - fieldLabel: gettext('Enabled') - } + fieldLabel: gettext('Enabled'), + }, ); me.items = [ @@ -90,8 +90,8 @@ Ext.define('PVE.window.ReplicaEdit', { } return values; }, - items: items - } + items: items, + }, ]; me.callParent(); @@ -104,8 +104,8 @@ Ext.define('PVE.window.ReplicaEdit', { Ext.Array.forEach(jobs, function(job) { var match = /^([0-9]+)\-([0-9]+)$/.exec(job.id); if (match) { - var vmid = parseInt(match[1],10); - var id = parseInt(match[2],10); + var vmid = parseInt(match[1], 10); + var id = parseInt(match[2], 10); if (highestids[vmid] < id || highestids[vmid] === undefined) { highestids[vmid] = id; @@ -114,7 +114,7 @@ Ext.define('PVE.window.ReplicaEdit', { }); me.highestids = highestids; - } + }, }); } else { @@ -123,10 +123,10 @@ Ext.define('PVE.window.ReplicaEdit', { response.result.data.enabled = !response.result.data.disable; me.setValues(response.result.data); me.digest = response.result.data.digest; - } + }, }); } - } + }, }); /* callback is a function and string */ @@ -142,32 +142,32 @@ Ext.define('PVE.grid.ReplicaView', { controller: { xclass: 'Ext.app.ViewController', - addJob: function(button,event,rec) { + addJob: function(button, event, rec) { var me = this.getView(); var controller = this; var win = Ext.create('PVE.window.ReplicaEdit', { isCreate: true, method: 'POST', - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); win.on('destroy', function() { controller.reload(); }); win.show(); }, - editJob: function(button,event,rec) { + editJob: function(button, event, rec) { var me = this.getView(); var controller = this; var data = rec.data; var win = Ext.create('PVE.window.ReplicaEdit', { url: '/cluster/replication/' + data.id, method: 'PUT', - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); win.on('destroy', function() { controller.reload(); }); win.show(); }, - scheduleJobNow: function(button,event,rec) { + scheduleJobNow: function(button, event, rec) { var me = this.getView(); var controller = this; @@ -178,7 +178,7 @@ Ext.define('PVE.grid.ReplicaView', { callback: function() { controller.reload(); }, failure: function (response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); }, @@ -187,7 +187,7 @@ Ext.define('PVE.grid.ReplicaView', { var controller = this; var logView = Ext.create('Proxmox.panel.LogView', { border: false, - url: "/api2/extjs/nodes/" + me.nodename + "/replication/" + rec.data.id + "/log" + url: "/api2/extjs/nodes/" + me.nodename + "/replication/" + rec.data.id + "/log", }); var win = Ext.create('Ext.window.Window', { items: [ logView ], @@ -195,13 +195,13 @@ Ext.define('PVE.grid.ReplicaView', { width: 800, height: 400, modal: true, - title: gettext("Replication Log") + title: gettext("Replication Log"), }); var task = { run: function() { logView.requestUpdate(); }, - interval: 1000 + interval: 1000, }; Ext.TaskManager.start(task); win.on('destroy', function() { @@ -234,45 +234,45 @@ Ext.define('PVE.grid.ReplicaView', { control: { '#': { itemdblclick: 'dblClick', - afterlayout: 'checkPrerequisites' - } - } + afterlayout: 'checkPrerequisites', + }, + }, }, tbar: [ { text: gettext('Add'), itemId: 'addButton', - handler: 'addJob' + handler: 'addJob', }, { xtype: 'proxmoxButton', text: gettext('Edit'), itemId: 'editButton', handler: 'editJob', - disabled: true + disabled: true, }, { xtype: 'proxmoxStdRemoveButton', itemId: 'removeButton', baseurl: '/api2/extjs/cluster/replication/', dangerous: true, - callback: 'reload' + callback: 'reload', }, { xtype: 'proxmoxButton', text: gettext('Log'), itemId: 'logButton', handler: 'showLog', - disabled: true + disabled: true, }, { xtype: 'proxmoxButton', text: gettext('Schedule now'), itemId: 'scheduleNowButton', handler: 'scheduleJobNow', - disabled: true - } + disabled: true, + }, ], initComponent: function() { @@ -289,28 +289,28 @@ Ext.define('PVE.grid.ReplicaView', { dataIndex: 'enabled', xtype: 'checkcolumn', sortable: true, - disabled: true + disabled: true, }, { text: 'ID', dataIndex: 'id', width: 60, - hidden: true + hidden: true, }, { text: gettext('Guest'), dataIndex: 'guest', - width: 75 + width: 75, }, { text: gettext('Job'), dataIndex: 'jobnum', - width: 60 + width: 60, }, { text: gettext('Target'), - dataIndex: 'target' - } + dataIndex: 'target', + }, ]; if (!me.nodename) { @@ -359,7 +359,7 @@ Ext.define('PVE.grid.ReplicaView', { } return icons.join(',') + ' ' + states.join(','); - } + }, }, { text: gettext('Last Sync'), @@ -375,13 +375,13 @@ Ext.define('PVE.grid.ReplicaView', { } return Proxmox.Utils.render_timestamp(value); - } + }, }, { text: gettext('Duration'), dataIndex: 'duration', width: 60, - renderer: Proxmox.Utils.render_duration + renderer: Proxmox.Utils.render_duration, }, { text: gettext('Next Sync'), @@ -400,8 +400,8 @@ Ext.define('PVE.grid.ReplicaView', { } return Proxmox.Utils.render_timestamp(value); - } - } + }, + }, ); } @@ -409,7 +409,7 @@ Ext.define('PVE.grid.ReplicaView', { { text: gettext('Schedule'), width: 75, - dataIndex: 'schedule' + dataIndex: 'schedule', }, { text: gettext('Rate limit'), @@ -421,13 +421,13 @@ Ext.define('PVE.grid.ReplicaView', { return value.toString() + ' MB/s'; }, - hidden: true + hidden: true, }, { text: gettext('Comment'), dataIndex: 'comment', - renderer: Ext.htmlEncode - } + renderer: Ext.htmlEncode, + }, ); me.rstore = Ext.create('Proxmox.data.UpdateStore', { @@ -436,20 +436,20 @@ Ext.define('PVE.grid.ReplicaView', { interval: 3000, proxy: { type: 'proxmox', - url: "/api2/json" + url - } + url: "/api2/json" + url, + }, }); me.store = Ext.create('Proxmox.data.DiffStore', { rstore: me.rstore, sorters: [ { - property: 'guest' + property: 'guest', }, { - property: 'jobnum' - } - ] + property: 'jobnum', + }, + ], }); me.callParent(); @@ -472,7 +472,7 @@ Ext.define('PVE.grid.ReplicaView', { me.on('destroy', me.rstore.stopUpdate); me.rstore.startUpdate(); - } + }, }, function() { Ext.define('pve-replication', { @@ -483,16 +483,16 @@ Ext.define('PVE.grid.ReplicaView', { { name: 'jobnum', type: 'integer' }, { name: 'schedule', defaultValue: '*/15' }, { name: 'disable', defaultValue: '' }, - { name: 'enabled', calculate: function(data) { return !data.disable; } } - ] + { name: 'enabled', calculate: function(data) { return !data.disable; } }, + ], }); Ext.define('pve-replication-state', { extend: 'pve-replication', fields: [ 'last_sync', 'next_sync', 'error', 'duration', 'state', - 'fail_count', 'remove_job', 'pid' - ] + 'fail_count', 'remove_job', 'pid', + ], }); }); diff --git a/www/manager6/grid/ResourceGrid.js b/www/manager6/grid/ResourceGrid.js index d7f1f6cb..68065a0a 100644 --- a/www/manager6/grid/ResourceGrid.js +++ b/www/manager6/grid/ResourceGrid.js @@ -5,7 +5,7 @@ Ext.define('PVE.grid.ResourceGrid', { border: false, defaultSorter: { property: 'type', - direction: 'ASC' + direction: 'ASC', }, initComponent : function() { var me = this; @@ -18,7 +18,7 @@ Ext.define('PVE.grid.ResourceGrid', { var store = Ext.create('Ext.data.Store', { model: 'PVEResources', sorters: me.defaultSorter, - proxy: { type: 'memory' } + proxy: { type: 'memory' }, }); var textfilter = ''; @@ -162,12 +162,12 @@ Ext.define('PVE.grid.ResourceGrid', { var v = field.getValue(); textfilter = v.toLowerCase(); filter_task.delay(500); - } - } - } + }, + }, + }, ], viewConfig: { - stripeRows: true + stripeRows: true, }, listeners: { itemcontextmenu: PVE.Utils.createCmdMenu, @@ -177,12 +177,12 @@ Ext.define('PVE.grid.ResourceGrid', { }, destroy: function() { rstore.un("load", load_cb); - } + }, }, - columns: coldef + columns: coldef, }); me.callParent(); updateGrid(); rstore.on("load", load_cb); - } + }, }); diff --git a/www/manager6/ha/Fencing.js b/www/manager6/ha/Fencing.js index a9a7a690..c9c7f2a5 100644 --- a/www/manager6/ha/Fencing.js +++ b/www/manager6/ha/Fencing.js @@ -9,7 +9,7 @@ Ext.define('PVE.ha.FencingView', { var store = new Ext.data.Store({ model: 'pve-ha-fencing', - data: [] + data: [], }); Ext.apply(me, { @@ -18,32 +18,32 @@ Ext.define('PVE.ha.FencingView', { viewConfig: { trackOver: false, deferEmptyText: false, - emptyText: 'Use watchdog based fencing.' + emptyText: 'Use watchdog based fencing.', }, columns: [ { header: 'Node', width: 100, sortable: true, - dataIndex: 'node' + dataIndex: 'node', }, { header: gettext('Command'), flex: 1, - dataIndex: 'command' - } - ] + dataIndex: 'command', + }, + ], }); me.callParent(); - } + }, }, function() { Ext.define('pve-ha-fencing', { extend: 'Ext.data.Model', fields: [ - 'node', 'command', 'digest' - ] + 'node', 'command', 'digest', + ], }); }); diff --git a/www/manager6/ha/GroupEdit.js b/www/manager6/ha/GroupEdit.js index c132b1d6..c91f5d62 100644 --- a/www/manager6/ha/GroupEdit.js +++ b/www/manager6/ha/GroupEdit.js @@ -24,8 +24,8 @@ Ext.define('PVE.ha.GroupInputPanel', { listeners: { selectionchange: function(model, selected) { update_nodefield(selected); - } - } + }, + }, }); // use already cached data to avoid an API call @@ -36,14 +36,14 @@ Ext.define('PVE.ha.GroupInputPanel', { data: data, proxy: { type: 'memory', - reader: {type: 'json'} + reader: {type: 'json'}, }, sorters: [ { property : 'node', - direction: 'ASC' - } - ] + direction: 'ASC', + }, + ], }); var nodegrid = Ext.createWidget('grid', { @@ -55,21 +55,21 @@ Ext.define('PVE.ha.GroupInputPanel', { { header: gettext('Node'), flex: 1, - dataIndex: 'node' + dataIndex: 'node', }, { header: gettext('Memory usage') + " %", renderer: PVE.Utils.render_mem_usage_percent, sortable: true, width: 150, - dataIndex: 'mem' + dataIndex: 'mem', }, { header: gettext('CPU usage'), renderer: PVE.Utils.render_cpu, sortable: true, width: 150, - dataIndex: 'cpu' + dataIndex: 'cpu', }, { header: 'Priority', @@ -87,11 +87,11 @@ Ext.define('PVE.ha.GroupInputPanel', { var record = numberfield.getWidgetRecord(); record.set('priority', value); update_nodefield(sm.getSelection()); - } - } - } - } - ] + }, + }, + }, + }, + ], }); var nodefield = Ext.create('Ext.form.field.Hidden', { @@ -100,12 +100,12 @@ Ext.define('PVE.ha.GroupInputPanel', { listeners: { change: function (nodefield, value) { update_node_selection(value); - } + }, }, isValid: function () { var value = nodefield.getValue(); return (value && 0 !== value.length); - } + }, }); update_node_selection = function(string) { @@ -157,9 +157,9 @@ Ext.define('PVE.ha.GroupInputPanel', { value: me.groupId || '', fieldLabel: 'ID', vtype: 'StorageId', - allowBlank: false + allowBlank: false, }, - nodefield + nodefield, ]; me.column2 = [ @@ -167,27 +167,27 @@ Ext.define('PVE.ha.GroupInputPanel', { xtype: 'proxmoxcheckbox', name: 'restricted', uncheckedValue: 0, - fieldLabel: 'restricted' + fieldLabel: 'restricted', }, { xtype: 'proxmoxcheckbox', name: 'nofailback', uncheckedValue: 0, - fieldLabel: 'nofailback' - } + fieldLabel: 'nofailback', + }, ]; me.columnB = [ { xtype: 'textfield', name: 'comment', - fieldLabel: gettext('Comment') + fieldLabel: gettext('Comment'), }, - nodegrid + nodegrid, ]; me.callParent(); - } + }, }); Ext.define('PVE.ha.GroupEdit', { @@ -210,12 +210,12 @@ Ext.define('PVE.ha.GroupEdit', { var ipanel = Ext.create('PVE.ha.GroupInputPanel', { isCreate: me.isCreate, - groupId: me.groupId + groupId: me.groupId, }); Ext.apply(me, { subject: gettext('HA Group'), - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -226,8 +226,8 @@ Ext.define('PVE.ha.GroupEdit', { var values = response.result.data; ipanel.setValues(values); - } + }, }); } - } + }, }); diff --git a/www/manager6/ha/GroupSelector.js b/www/manager6/ha/GroupSelector.js index 46017da5..b1401a58 100644 --- a/www/manager6/ha/GroupSelector.js +++ b/www/manager6/ha/GroupSelector.js @@ -12,35 +12,35 @@ Ext.define('PVE.ha.GroupSelector', { header: gettext('Group'), width: 100, sortable: true, - dataIndex: 'group' + dataIndex: 'group', }, { header: gettext('Nodes'), width: 100, sortable: false, - dataIndex: 'nodes' + dataIndex: 'nodes', }, { header: gettext('Comment'), flex: 1, dataIndex: 'comment', - renderer: Ext.String.htmlEncode - } - ] + renderer: Ext.String.htmlEncode, + }, + ], }, store: { model: 'pve-ha-groups', sorters: { property: 'group', - order: 'DESC' - } + order: 'DESC', + }, }, initComponent: function() { var me = this; me.callParent(); me.getStore().load(); - } + }, }, function() { @@ -50,17 +50,17 @@ Ext.define('PVE.ha.GroupSelector', { 'group', 'type', 'digest', 'nodes', 'comment', { name : 'restricted', - type: 'boolean' + type: 'boolean', }, { name : 'nofailback', - type: 'boolean' - } + type: 'boolean', + }, ], proxy: { type: 'proxmox', - url: "/api2/json/cluster/ha/groups" + url: "/api2/json/cluster/ha/groups", }, - idProperty: 'group' + idProperty: 'group', }); }); diff --git a/www/manager6/ha/Groups.js b/www/manager6/ha/Groups.js index 9d92f4df..42d9c588 100644 --- a/www/manager6/ha/Groups.js +++ b/www/manager6/ha/Groups.js @@ -16,8 +16,8 @@ Ext.define('PVE.ha.GroupsView', { model: 'pve-ha-groups', sorters: { property: 'group', - order: 'DESC' - } + order: 'DESC', + }, }); var reload = function() { @@ -29,8 +29,8 @@ Ext.define('PVE.ha.GroupsView', { var run_editor = function() { var rec = sm.getSelection()[0]; - var win = Ext.create('PVE.ha.GroupEdit',{ - groupId: rec.data.group + var win = Ext.create('PVE.ha.GroupEdit', { + groupId: rec.data.group, }); win.on('destroy', reload); win.show(); @@ -41,67 +41,67 @@ Ext.define('PVE.ha.GroupsView', { baseurl: '/cluster/ha/groups/', callback: function() { reload(); - } + }, }); var edit_btn = new Proxmox.button.Button({ text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); Ext.apply(me, { store: store, selModel: sm, viewConfig: { - trackOver: false + trackOver: false, }, tbar: [ { text: gettext('Create'), disabled: !caps.nodes['Sys.Console'], handler: function() { - var win = Ext.create('PVE.ha.GroupEdit',{}); + var win = Ext.create('PVE.ha.GroupEdit', {}); win.on('destroy', reload); win.show(); - } + }, }, - edit_btn, remove_btn + edit_btn, remove_btn, ], columns: [ { header: gettext('Group'), width: 150, sortable: true, - dataIndex: 'group' + dataIndex: 'group', }, { header: 'restricted', width: 100, sortable: true, renderer: Proxmox.Utils.format_boolean, - dataIndex: 'restricted' + dataIndex: 'restricted', }, { header: 'nofailback', width: 100, sortable: true, renderer: Proxmox.Utils.format_boolean, - dataIndex: 'nofailback' + dataIndex: 'nofailback', }, { header: gettext('Nodes'), flex: 1, sortable: false, - dataIndex: 'nodes' + dataIndex: 'nodes', }, { header: gettext('Comment'), flex: 1, renderer: Ext.String.htmlEncode, - dataIndex: 'comment' - } + dataIndex: 'comment', + }, ], listeners: { activate: reload, @@ -110,10 +110,10 @@ Ext.define('PVE.ha.GroupsView', { return false; } }, - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/ha/ResourceEdit.js b/www/manager6/ha/ResourceEdit.js index 39310ead..b3fc7726 100644 --- a/www/manager6/ha/ResourceEdit.js +++ b/www/manager6/ha/ResourceEdit.js @@ -27,7 +27,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { userCls: 'pmx-hint', value: 'Disabling the resource will stop the guest system. ' + 'See the online help for details.', - hidden: true + hidden: true, }); var fewVotesHint = Ext.createWidget({ @@ -35,7 +35,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { xtype: 'displayfield', userCls: 'pmx-hint', value: 'At least three quorum votes are recommended for reliable HA.', - hidden: true + hidden: true, }); Proxmox.Utils.API2Request({ @@ -55,7 +55,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { if (votes < MIN_QUORUM_VOTES) { fewVotesHint.setVisible(true); } - } + }, }); var vmidStore = (me.vmid) ? {} : { @@ -65,13 +65,13 @@ Ext.define('PVE.ha.VMResourceInputPanel', { filters: [ { property: 'type', - value: /lxc|qemu/ + value: /lxc|qemu/, }, { property: 'hastate', - value: /unmanaged/ - } - ] + value: /unmanaged/, + }, + ], }; // value is a string above, but a number below @@ -83,7 +83,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { fieldLabel: (me.vmid && me.guestType === 'ct') ? 'CT' : 'VM', value: me.vmid, store: vmidStore, - validateExists: true + validateExists: true, }, { xtype: 'proxmoxintegerfield', @@ -92,7 +92,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { value: 1, minValue: 0, maxValue: 10, - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxintegerfield', @@ -101,15 +101,15 @@ Ext.define('PVE.ha.VMResourceInputPanel', { value: 1, minValue: 0, maxValue: 10, - allowBlank: false - } + allowBlank: false, + }, ]; me.column2 = [ { xtype: 'pveHAGroupSelector', name: 'group', - fieldLabel: gettext('Group') + fieldLabel: gettext('Group'), }, { xtype: 'proxmoxKVComboBox', @@ -120,7 +120,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { ['started', 'started'], ['stopped', 'stopped'], ['ignored', 'ignored'], - ['disabled', 'disabled'] + ['disabled', 'disabled'], ], listeners: { 'change': function(field, newValue) { @@ -132,23 +132,23 @@ Ext.define('PVE.ha.VMResourceInputPanel', { disabledHint.setVisible(false); } } - } - } + }, + }, }, - disabledHint + disabledHint, ]; me.columnB = [ { xtype: 'textfield', name: 'comment', - fieldLabel: gettext('Comment') + fieldLabel: gettext('Comment'), }, - fewVotesHint + fewVotesHint, ]; me.callParent(); - } + }, }); Ext.define('PVE.ha.VMResourceEdit', { @@ -176,14 +176,14 @@ Ext.define('PVE.ha.VMResourceEdit', { var ipanel = Ext.create('PVE.ha.VMResourceInputPanel', { isCreate: me.isCreate, vmid: me.vmid, - guestType: me.guestType + guestType: me.guestType, }); Ext.apply(me, { subject: gettext('Resource') + ': ' + gettext('Container') + '/' + gettext('Virtual Machine'), isAdd: true, - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -203,8 +203,8 @@ Ext.define('PVE.ha.VMResourceEdit', { values.vmid = res[2]; ipanel.setValues(values); - } + }, }); } - } + }, }); diff --git a/www/manager6/ha/Resources.js b/www/manager6/ha/Resources.js index f0ae7fd3..0c061731 100644 --- a/www/manager6/ha/Resources.js +++ b/www/manager6/ha/Resources.js @@ -22,8 +22,8 @@ Ext.define('PVE.ha.ResourcesView', { rstore: me.rstore, filters: { property: 'type', - value: 'service' - } + value: 'service', + }, }); var reload = function() { @@ -38,7 +38,7 @@ Ext.define('PVE.ha.ResourcesView', { metaData.tdCls = 'proxmox-invalid-row'; var html = '

' + Ext.htmlEncode(msg) + '

'; metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + - html.replace(/\"/g,'"') + '"'; + html.replace(/\"/g, '"') + '"'; } } return value; @@ -59,9 +59,9 @@ Ext.define('PVE.ha.ResourcesView', { var guestType = res[1]; var vmid = res[2]; - var win = Ext.create('PVE.ha.VMResourceEdit',{ + var win = Ext.create('PVE.ha.VMResourceEdit', { guestType: guestType, - vmid: vmid + vmid: vmid, }); win.on('destroy', reload); win.show(); @@ -76,33 +76,33 @@ Ext.define('PVE.ha.ResourcesView', { }, callback: function() { reload(); - } + }, }); var edit_btn = new Proxmox.button.Button({ text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); Ext.apply(me, { store: store, selModel: sm, viewConfig: { - trackOver: false + trackOver: false, }, tbar: [ { text: gettext('Add'), disabled: !caps.nodes['Sys.Console'], handler: function() { - var win = Ext.create('PVE.ha.VMResourceEdit',{}); + var win = Ext.create('PVE.ha.VMResourceEdit', {}); win.on('destroy', reload); win.show(); - } + }, }, - edit_btn, remove_btn + edit_btn, remove_btn, ], columns: [ @@ -110,19 +110,19 @@ Ext.define('PVE.ha.ResourcesView', { header: 'ID', width: 100, sortable: true, - dataIndex: 'sid' + dataIndex: 'sid', }, { header: gettext('State'), width: 100, sortable: true, - dataIndex: 'state' + dataIndex: 'state', }, { header: gettext('Node'), width: 100, sortable: true, - dataIndex: 'node' + dataIndex: 'node', }, { header: gettext('Request State'), @@ -132,14 +132,14 @@ Ext.define('PVE.ha.ResourcesView', { renderer: function(v) { return v || 'started'; }, - dataIndex: 'request_state' + dataIndex: 'request_state', }, { header: gettext('CRM State'), width: 100, hidden: true, sortable: true, - dataIndex: 'crm_state' + dataIndex: 'crm_state', }, { header: gettext('Name'), @@ -152,14 +152,14 @@ Ext.define('PVE.ha.ResourcesView', { width: 100, sortable: true, renderer: (v) => v === undefined ? '1' : v, - dataIndex: 'max_restart' + dataIndex: 'max_restart', }, { header: gettext('Max. Relocate'), width: 100, sortable: true, renderer: (v) => v === undefined ? '1' : v, - dataIndex: 'max_relocate' + dataIndex: 'max_relocate', }, { header: gettext('Group'), @@ -168,14 +168,14 @@ Ext.define('PVE.ha.ResourcesView', { renderer: function(value, metaData, record) { return render_error('group', value, metaData, record); }, - dataIndex: 'group' + dataIndex: 'group', }, { header: gettext('Description'), flex: 1, renderer: Ext.String.htmlEncode, - dataIndex: 'comment' - } + dataIndex: 'comment', + }, ], listeners: { beforeselect: function(grid, record, index, eOpts) { @@ -183,10 +183,10 @@ Ext.define('PVE.ha.ResourcesView', { return false; } }, - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/ha/Status.js b/www/manager6/ha/Status.js index 2929710d..08515710 100644 --- a/www/manager6/ha/Status.js +++ b/www/manager6/ha/Status.js @@ -5,7 +5,7 @@ Ext.define('PVE.ha.Status', { onlineHelp: 'chapter_ha_manager', layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, initComponent: function() { @@ -18,8 +18,8 @@ Ext.define('PVE.ha.Status', { groupField: 'type', proxy: { type: 'proxmox', - url: '/api2/json/cluster/ha/status/current' - } + url: '/api2/json/cluster/ha/status/current', + }, }); me.items = [{ @@ -28,17 +28,17 @@ Ext.define('PVE.ha.Status', { rstore: me.rstore, border: 0, collapsible: true, - padding: '0 0 20 0' - },{ + padding: '0 0 20 0', + }, { xtype: 'pveHAResourcesView', flex: 1, collapsible: true, title: gettext('Resources'), border: 0, - rstore: me.rstore + rstore: me.rstore, }]; me.callParent(); me.on('activate', me.rstore.startUpdate); - } + }, }); diff --git a/www/manager6/ha/StatusView.js b/www/manager6/ha/StatusView.js index 09f8fa54..4ece08fd 100644 --- a/www/manager6/ha/StatusView.js +++ b/www/manager6/ha/StatusView.js @@ -8,7 +8,7 @@ Ext.define('PVE.ha.StatusView', { quorum: 1, master: 2, lrm: 3, - service: 4 + service: 4, }, initComponent : function() { @@ -28,34 +28,34 @@ Ext.define('PVE.ha.StatusView', { var p1 = me.sortPriority[rec1.data.type]; var p2 = me.sortPriority[rec2.data.type]; return (p1 !== p2) ? ((p1 > p2) ? 1 : -1) : 0; - } + }, }], filters: { property: 'type', value: 'service', - operator: '!=' - } + operator: '!=', + }, }); Ext.apply(me, { store: store, stateful: false, viewConfig: { - trackOver: false + trackOver: false, }, columns: [ { header: gettext('Type'), width: 80, - dataIndex: 'type' + dataIndex: 'type', }, { header: gettext('Status'), width: 80, flex: 1, - dataIndex: 'status' - } - ] + dataIndex: 'status', + }, + ], }); me.callParent(); @@ -63,7 +63,7 @@ Ext.define('PVE.ha.StatusView', { me.on('activate', me.rstore.startUpdate); me.on('destroy', me.rstore.stopUpdate); - } + }, }, function() { Ext.define('pve-ha-status', { @@ -88,7 +88,7 @@ Ext.define('PVE.ha.StatusView', { }, }, ], - idProperty: 'id' + idProperty: 'id', }); }); diff --git a/www/manager6/lxc/CmdMenu.js b/www/manager6/lxc/CmdMenu.js index 5d5a2afd..507f21f8 100644 --- a/www/manager6/lxc/CmdMenu.js +++ b/www/manager6/lxc/CmdMenu.js @@ -23,7 +23,7 @@ Ext.define('PVE.lxc.CmdMenu', { method: 'POST', failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); }; @@ -55,7 +55,7 @@ Ext.define('PVE.lxc.CmdMenu', { disabled: running, handler: function() { vm_command('start'); - } + }, }, // { // text: gettext('Suspend'), @@ -94,7 +94,7 @@ Ext.define('PVE.lxc.CmdMenu', { vm_command('shutdown'); }); - } + }, }, { text: gettext('Stop'), @@ -110,7 +110,7 @@ Ext.define('PVE.lxc.CmdMenu', { vm_command("stop"); }); - } + }, }, { text: gettext('Reboot'), @@ -126,11 +126,11 @@ Ext.define('PVE.lxc.CmdMenu', { vm_command("reboot"); }); - } + }, }, { xtype: 'menuseparator', - hidden: (standalone || !caps.vms['VM.Migrate']) && !caps.vms['VM.Allocate'] && !caps.vms['VM.Clone'] + hidden: (standalone || !caps.vms['VM.Migrate']) && !caps.vms['VM.Allocate'] && !caps.vms['VM.Clone'], }, { text: gettext('Clone'), @@ -138,7 +138,7 @@ Ext.define('PVE.lxc.CmdMenu', { hidden: !caps.vms['VM.Clone'], handler: function() { PVE.window.Clone.wrap(nodename, vmid, me.isTemplate, 'lxc'); - } + }, }, { text: gettext('Migrate'), @@ -148,10 +148,10 @@ Ext.define('PVE.lxc.CmdMenu', { var win = Ext.create('PVE.window.Migrate', { vmtype: 'lxc', nodename: nodename, - vmid: vmid + vmid: vmid, }); win.show(); - } + }, }, { text: gettext('Convert to template'), @@ -168,10 +168,10 @@ Ext.define('PVE.lxc.CmdMenu', { method: 'POST', failure: function(response, opts) { Ext.Msg.alert('Error', response.htmlStatus); - } + }, }); }); - } + }, }, { xtype: 'menuseparator' }, { @@ -179,10 +179,10 @@ Ext.define('PVE.lxc.CmdMenu', { iconCls: 'fa fa-fw fa-terminal', handler: function() { PVE.Utils.openDefaultConsoleWindow(true, 'lxc', vmid, nodename, vmname); - } - } + }, + }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js index c2222d3a..9529248d 100644 --- a/www/manager6/lxc/Config.js +++ b/www/manager6/lxc/Config.js @@ -28,7 +28,7 @@ Ext.define('PVE.lxc.Config', { me.statusStore = Ext.create('Proxmox.data.ObjectStore', { url: '/api2/json' + base_url + '/status/current', - interval: 1000 + interval: 1000, }); var vm_command = function(cmd, params) { @@ -39,7 +39,7 @@ Ext.define('PVE.lxc.Config', { method: 'POST', failure: function(response, opts) { Ext.Msg.alert('Error', response.htmlStatus); - } + }, }); }; @@ -50,7 +50,7 @@ Ext.define('PVE.lxc.Config', { handler: function() { vm_command('start'); }, - iconCls: 'fa fa-play' + iconCls: 'fa fa-play', }); var shutdownBtn = Ext.create('PVE.button.Split', { @@ -70,7 +70,7 @@ Ext.define('PVE.lxc.Config', { handler: function() { vm_command("reboot"); }, - iconCls: 'fa fa-refresh' + iconCls: 'fa fa-refresh', }, { text: gettext('Stop'), @@ -81,10 +81,10 @@ Ext.define('PVE.lxc.Config', { handler: function() { vm_command("stop"); }, - iconCls: 'fa fa-stop' - }] + iconCls: 'fa fa-stop', + }], }, - iconCls: 'fa fa-power-off' + iconCls: 'fa fa-power-off', }); var migrateBtn = Ext.create('Ext.Button', { @@ -95,11 +95,11 @@ Ext.define('PVE.lxc.Config', { var win = Ext.create('PVE.window.Migrate', { vmtype: 'lxc', nodename: nodename, - vmid: vmid + vmid: vmid, }); win.show(); }, - iconCls: 'fa fa-send-o' + iconCls: 'fa fa-send-o', }); var moreBtn = Ext.create('Proxmox.button.Button', { @@ -111,7 +111,7 @@ Ext.define('PVE.lxc.Config', { hidden: caps.vms['VM.Clone'] ? false : true, handler: function() { PVE.window.Clone.wrap(nodename, vmid, template, 'lxc'); - } + }, }, { text: gettext('Convert to template'), @@ -127,9 +127,9 @@ Ext.define('PVE.lxc.Config', { method: 'POST', failure: function(response, opts) { Ext.Msg.alert('Error', response.htmlStatus); - } + }, }); - } + }, }, { iconCls: 'fa fa-heartbeat ', @@ -140,9 +140,9 @@ Ext.define('PVE.lxc.Config', { Ext.create('PVE.ha.VMResourceEdit', { vmid: vmid, guestType: 'ct', - isCreate: (!ha || ha === 'unmanaged') + isCreate: (!ha || ha === 'unmanaged'), }).show(); - } + }, }, { text: gettext('Remove'), @@ -151,12 +151,12 @@ Ext.define('PVE.lxc.Config', { handler: function() { Ext.create('PVE.window.SafeDestroy', { url: base_url, - item: { type: 'CT', id: vmid } + item: { type: 'CT', id: vmid }, }).show(); }, - iconCls: 'fa fa-trash-o' - } - ]} + iconCls: 'fa fa-trash-o', + }, + ]}, }); var consoleBtn = Ext.create('PVE.button.ConsoleButton', { @@ -165,18 +165,18 @@ Ext.define('PVE.lxc.Config', { consoleName: vm.name, hidden: template, nodename: nodename, - vmid: vmid + vmid: vmid, }); var statusTxt = Ext.create('Ext.toolbar.TextItem', { data: { - lock: undefined + lock: undefined, }, tpl: [ '', ' ({lock})', - '' - ] + '', + ], }); @@ -191,9 +191,9 @@ Ext.define('PVE.lxc.Config', { title: gettext('Summary'), xtype: 'pveGuestSummary', iconCls: 'fa fa-book', - itemId: 'summary' - } - ] + itemId: 'summary', + }, + ], }); if (caps.vms['VM.Console'] && !template) { @@ -206,8 +206,8 @@ Ext.define('PVE.lxc.Config', { vmid: vmid, consoleType: 'lxc', xtermjs: true, - nodename: nodename - } + nodename: nodename, + }, ); } @@ -217,25 +217,25 @@ Ext.define('PVE.lxc.Config', { itemId: 'resources', expandedOnInit: true, iconCls: 'fa fa-cube', - xtype: 'pveLxcRessourceView' + xtype: 'pveLxcRessourceView', }, { title: gettext('Network'), iconCls: 'fa fa-exchange', itemId: 'network', - xtype: 'pveLxcNetworkView' + xtype: 'pveLxcNetworkView', }, { title: gettext('DNS'), iconCls: 'fa fa-globe', itemId: 'dns', - xtype: 'pveLxcDNS' + xtype: 'pveLxcDNS', }, { title: gettext('Options'), itemId: 'options', iconCls: 'fa fa-gear', - xtype: 'pveLxcOptions' + xtype: 'pveLxcOptions', }, { title: gettext('Task History'), @@ -243,8 +243,8 @@ Ext.define('PVE.lxc.Config', { iconCls: 'fa fa-list', xtype: 'proxmoxNodeTasks', nodename: nodename, - vmidFilter: vmid - } + vmidFilter: vmid, + }, ); if (caps.vms['VM.Backup']) { @@ -252,13 +252,13 @@ Ext.define('PVE.lxc.Config', { title: gettext('Backup'), iconCls: 'fa fa-floppy-o', xtype: 'pveBackupView', - itemId: 'backup' + itemId: 'backup', }, { title: gettext('Replication'), iconCls: 'fa fa-retweet', xtype: 'pveReplicaView', - itemId: 'replication' + itemId: 'replication', }); } @@ -269,7 +269,7 @@ Ext.define('PVE.lxc.Config', { iconCls: 'fa fa-history', xtype: 'pveGuestSnapshotTree', type: 'lxc', - itemId: 'snapshot' + itemId: 'snapshot', }); } @@ -282,7 +282,7 @@ Ext.define('PVE.lxc.Config', { allow_iface: true, base_url: base_url + '/firewall/rules', list_refs_url: base_url + '/firewall/refs', - itemId: 'firewall' + itemId: 'firewall', }, { xtype: 'pveFirewallOptions', @@ -292,7 +292,7 @@ Ext.define('PVE.lxc.Config', { title: gettext('Options'), base_url: base_url + '/firewall/options', fwtype: 'vm', - itemId: 'firewall-options' + itemId: 'firewall-options', }, { xtype: 'pveFirewallAliases', @@ -300,7 +300,7 @@ Ext.define('PVE.lxc.Config', { groups: ['firewall'], iconCls: 'fa fa-external-link', base_url: base_url + '/firewall/aliases', - itemId: 'firewall-aliases' + itemId: 'firewall-aliases', }, { xtype: 'pveIPSet', @@ -309,7 +309,7 @@ Ext.define('PVE.lxc.Config', { iconCls: 'fa fa-list-ol', base_url: base_url + '/firewall/ipset', list_refs_url: base_url + '/firewall/refs', - itemId: 'firewall-ipset' + itemId: 'firewall-ipset', }, { title: gettext('Log'), @@ -318,8 +318,8 @@ Ext.define('PVE.lxc.Config', { onlineHelp: 'chapter_pve_firewall', itemId: 'firewall-fwlog', xtype: 'proxmoxLogView', - url: '/api2/extjs' + base_url + '/firewall/log' - } + url: '/api2/extjs' + base_url + '/firewall/log', + }, ); } @@ -329,7 +329,7 @@ Ext.define('PVE.lxc.Config', { title: gettext('Permissions'), itemId: 'permissions', iconCls: 'fa fa-unlock', - path: '/vms/' + vmid + path: '/vms/' + vmid, }); } @@ -374,5 +374,5 @@ Ext.define('PVE.lxc.Config', { me.on('destroy', function() { me.statusStore.stopUpdate(); }); - } + }, }); diff --git a/www/manager6/lxc/CreateWizard.js b/www/manager6/lxc/CreateWizard.js index 781fc251..8862f24e 100644 --- a/www/manager6/lxc/CreateWizard.js +++ b/www/manager6/lxc/CreateWizard.js @@ -6,12 +6,12 @@ Ext.define('PVE.lxc.CreateWizard', { data: { nodename: '', storage: '', - unprivileged: true - } + unprivileged: true, + }, }, cbindData: { - nodename: undefined + nodename: undefined, }, subject: gettext('LXC Container'), @@ -27,14 +27,14 @@ Ext.define('PVE.lxc.CreateWizard', { name: 'nodename', cbind: { selectCurNode: '{!nodename}', - preferredValue: '{nodename}' + preferredValue: '{nodename}', }, bind: { - value: '{nodename}' + value: '{nodename}', }, fieldLabel: gettext('Node'), allowBlank: false, - onlineValidator: true + onlineValidator: true, }, { xtype: 'pveGuestIDSelector', @@ -42,7 +42,7 @@ Ext.define('PVE.lxc.CreateWizard', { guestType: 'lxc', value: '', loadNextFreeID: true, - validateExists: false + validateExists: false, }, { xtype: 'proxmoxtextfield', @@ -51,17 +51,17 @@ Ext.define('PVE.lxc.CreateWizard', { value: '', fieldLabel: gettext('Hostname'), skipEmptyText: true, - allowBlank: true + allowBlank: true, }, { xtype: 'proxmoxcheckbox', name: 'unprivileged', value: true, bind: { - value: '{unprivileged}' + value: '{unprivileged}', }, - fieldLabel: gettext('Unprivileged container') - } + fieldLabel: gettext('Unprivileged container'), + }, ], column2: [ { @@ -69,7 +69,7 @@ Ext.define('PVE.lxc.CreateWizard', { fieldLabel: gettext('Resource Pool'), name: 'pool', value: '', - allowBlank: true + allowBlank: true, }, { xtype: 'textfield', @@ -83,7 +83,7 @@ Ext.define('PVE.lxc.CreateWizard', { if (f.rendered) { f.up().down('field[name=confirmpw]').validate(); } - } + }, }, { xtype: 'textfield', @@ -99,7 +99,7 @@ Ext.define('PVE.lxc.CreateWizard', { return "Passwords do not match!"; } return true; - } + }, }, { xtype: 'proxmoxtextfield', @@ -143,7 +143,7 @@ Ext.define('PVE.lxc.CreateWizard', { let files = ev.dataTransfer.files; PVE.Utils.loadSSHKeyFromFile(files[0], v => field.setValue(v)); }); - } + }, }, { xtype: 'filebutton', @@ -158,10 +158,10 @@ Ext.define('PVE.lxc.CreateWizard', { field.setValue(v); }); btn.reset(); - } - } - } - ] + }, + }, + }, + ], }, { xtype: 'inputpanel', @@ -177,8 +177,8 @@ Ext.define('PVE.lxc.CreateWizard', { allowBlank: false, bind: { value: '{storage}', - nodename: '{nodename}' - } + nodename: '{nodename}', + }, }, { xtype: 'pveFileSelector', @@ -187,11 +187,11 @@ Ext.define('PVE.lxc.CreateWizard', { fieldLabel: gettext('Template'), bind: { storage: '{storage}', - nodename: '{nodename}' + nodename: '{nodename}', }, - allowBlank: false - } - ] + allowBlank: false, + }, + ], }, { xtype: 'pveLxcMountPointInputPanel', @@ -201,33 +201,33 @@ Ext.define('PVE.lxc.CreateWizard', { unused: false, bind: { nodename: '{nodename}', - unprivileged: '{unprivileged}' + unprivileged: '{unprivileged}', }, - confid: 'rootfs' + confid: 'rootfs', }, { xtype: 'pveLxcCPUInputPanel', title: gettext('CPU'), - insideWizard: true + insideWizard: true, }, { xtype: 'pveLxcMemoryInputPanel', title: gettext('Memory'), - insideWizard: true + insideWizard: true, }, { xtype: 'pveLxcNetworkInputPanel', title: gettext('Network'), insideWizard: true, bind: { - nodename: '{nodename}' + nodename: '{nodename}', }, - isCreate: true + isCreate: true, }, { xtype: 'pveLxcDNSInputPanel', title: gettext('DNS'), - insideWizard: true + insideWizard: true, }, { title: gettext('Confirm'), @@ -239,14 +239,14 @@ Ext.define('PVE.lxc.CreateWizard', { model: 'KeyValue', sorters: [{ property : 'key', - direction: 'ASC' - }] + direction: 'ASC', + }], }, columns: [ {header: 'Key', width: 150, dataIndex: 'key'}, - {header: 'Value', flex: 1, dataIndex: 'value'} - ] - } + {header: 'Value', flex: 1, dataIndex: 'value'}, + ], + }, ], dockedItems: [ { @@ -254,8 +254,8 @@ Ext.define('PVE.lxc.CreateWizard', { name: 'start', dock: 'bottom', margin: '5 0 0 0', - boxLabel: gettext('Start after created') - } + boxLabel: gettext('Start after created'), + }, ], listeners: { show: function(panel) { @@ -280,7 +280,7 @@ Ext.define('PVE.lxc.CreateWizard', { summarystore.sort(); summarystore.resumeEvents(); summarystore.fireEvent('refresh'); - } + }, }, onSubmit: function() { var wizard = this.up('window'); @@ -308,18 +308,18 @@ Ext.define('PVE.lxc.CreateWizard', { var upid = response.result.data; var win = Ext.create('Proxmox.window.TaskViewer', { - upid: upid + upid: upid, }); win.show(); wizard.close(); }, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); - } - } - ] + }, + }, + ], }); diff --git a/www/manager6/lxc/DNS.js b/www/manager6/lxc/DNS.js index b1e03920..efced727 100644 --- a/www/manager6/lxc/DNS.js +++ b/www/manager6/lxc/DNS.js @@ -36,7 +36,7 @@ Ext.define('PVE.lxc.DNSInputPanel', { skipEmptyText: true, fieldLabel: gettext('DNS domain'), emptyText: gettext('use host settings'), - allowBlank: true + allowBlank: true, }, { xtype: 'proxmoxtextfield', @@ -45,8 +45,8 @@ Ext.define('PVE.lxc.DNSInputPanel', { allowBlank: true, emptyText: gettext('use host settings'), name: 'nameserver', - itemId: 'nameserver' - } + itemId: 'nameserver', + }, ]; if (me.insideWizard) { @@ -56,7 +56,7 @@ Ext.define('PVE.lxc.DNSInputPanel', { } me.callParent(); - } + }, }); Ext.define('PVE.lxc.DNSEdit', { @@ -69,7 +69,7 @@ Ext.define('PVE.lxc.DNSEdit', { Ext.apply(me, { subject: gettext('Resources'), - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -85,10 +85,10 @@ Ext.define('PVE.lxc.DNSEdit', { } ipanel.setValues(values); - } + }, }); } - } + }, }); Ext.define('PVE.lxc.DNS', { @@ -129,7 +129,7 @@ Ext.define('PVE.lxc.DNS', { name: 'hostname', vtype: 'DnsName', allowBlank: true, - emptyText: 'CT' + vmid.toString() + emptyText: 'CT' + vmid.toString(), }, onGetValues: function(values) { var params = values; @@ -139,9 +139,9 @@ Ext.define('PVE.lxc.DNS', { params = { hostname: 'CT'+vmid.toString()}; } return params; - } - } - } : undefined + }, + }, + } : undefined, }, searchdomain: { header: gettext('DNS domain'), @@ -149,7 +149,7 @@ Ext.define('PVE.lxc.DNS', { editor: caps.vms['VM.Config.Network'] ? 'PVE.lxc.DNSEdit' : undefined, renderer: function(value) { return value || gettext('use host settings'); - } + }, }, nameserver: { header: gettext('DNS server'), @@ -157,8 +157,8 @@ Ext.define('PVE.lxc.DNS', { editor: caps.vms['VM.Config.Network'] ? 'PVE.lxc.DNSEdit' : undefined, renderer: function(value) { return value || gettext('use host settings'); - } - } + }, + }, }; var baseurl = 'nodes/' + nodename + '/lxc/' + vmid + '/config'; @@ -185,13 +185,13 @@ Ext.define('PVE.lxc.DNS', { win = Ext.create(rowdef.editor, { pveSelNode: me.pveSelNode, confid: rec.data.key, - url: '/api2/extjs/nodes/' + nodename + '/lxc/' + vmid + '/config' + url: '/api2/extjs/nodes/' + nodename + '/lxc/' + vmid + '/config', }); } else { var config = Ext.apply({ pveSelNode: me.pveSelNode, confid: rec.data.key, - url: '/api2/extjs/nodes/' + nodename + '/lxc/' + vmid + '/config' + url: '/api2/extjs/nodes/' + nodename + '/lxc/' + vmid + '/config', }, rowdef.editor); win = Ext.createWidget(rowdef.editor.xtype, config); win.load(); @@ -209,7 +209,7 @@ Ext.define('PVE.lxc.DNS', { var rowdef = rows[rec.data.key]; return !!rowdef.editor; }, - handler: run_editor + handler: run_editor, }); var revert_btn = new PVE.button.PendingRevert(); @@ -240,13 +240,13 @@ Ext.define('PVE.lxc.DNS', { tbar: [ edit_btn, revert_btn ], rows: rows, editorConfig: { - url: "/api2/extjs/" + baseurl + url: "/api2/extjs/" + baseurl, }, listeners: { itemdblclick: run_editor, selectionchange: set_button_status, - activate: reload - } + activate: reload, + }, }); me.callParent(); @@ -258,5 +258,5 @@ Ext.define('PVE.lxc.DNS', { me.mon(me.getStore(), 'datachanged', function() { set_button_status(); }); - } + }, }); diff --git a/www/manager6/lxc/FeaturesEdit.js b/www/manager6/lxc/FeaturesEdit.js index e0b851de..042d32a6 100644 --- a/www/manager6/lxc/FeaturesEdit.js +++ b/www/manager6/lxc/FeaturesEdit.js @@ -10,7 +10,7 @@ Ext.define('PVE.lxc.FeaturesInputPanel', { viewModel: { parent: null, data: { - unprivileged: false + unprivileged: false, }, formulas: { privilegedOnly: function(get) { @@ -18,8 +18,8 @@ Ext.define('PVE.lxc.FeaturesInputPanel', { }, unprivilegedOnly: function(get) { return (!get('unprivileged') ? gettext('unprivileged only') : ''); - } - } + }, + }, }, items: [ @@ -29,13 +29,13 @@ Ext.define('PVE.lxc.FeaturesInputPanel', { name: 'keyctl', bind: { disabled: '{!unprivileged}', - boxLabel: '{unprivilegedOnly}' - } + boxLabel: '{unprivilegedOnly}', + }, }, { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Nesting'), - name: 'nesting' + name: 'nesting', }, { xtype: 'proxmoxcheckbox', @@ -43,8 +43,8 @@ Ext.define('PVE.lxc.FeaturesInputPanel', { fieldLabel: 'NFS', bind: { disabled: '{unprivileged}', - boxLabel: '{privilegedOnly}' - } + boxLabel: '{privilegedOnly}', + }, }, { xtype: 'proxmoxcheckbox', @@ -52,13 +52,13 @@ Ext.define('PVE.lxc.FeaturesInputPanel', { fieldLabel: 'CIFS', bind: { disabled: '{unprivileged}', - boxLabel: '{privilegedOnly}' - } + boxLabel: '{privilegedOnly}', + }, }, { xtype: 'proxmoxcheckbox', name: 'fuse', - fieldLabel: 'FUSE' + fieldLabel: 'FUSE', }, { xtype: 'proxmoxcheckbox', @@ -126,6 +126,6 @@ Ext.define('PVE.lxc.FeaturesEdit', { width: 350, items: [{ - xtype: 'pveLxcFeaturesInputPanel' + xtype: 'pveLxcFeaturesInputPanel', }], }); diff --git a/www/manager6/lxc/MPEdit.js b/www/manager6/lxc/MPEdit.js index f0a9233b..ebda5fdd 100644 --- a/www/manager6/lxc/MPEdit.js +++ b/www/manager6/lxc/MPEdit.js @@ -104,7 +104,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', { 'field[name=mpid]': { change: function(field, value) { field.validate(); - } + }, }, '#hdstorage': { change: function(field, newValue) { @@ -120,8 +120,8 @@ Ext.define('PVE.lxc.MountPointInputPanel', { var vm = me.getViewModel(); vm.set('type', rec.data.type); - } - } + }, + }, }, init: function(view) { @@ -138,7 +138,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', { if (view.isCreate) { vm.set('isIncludedInBackup', true); } - } + }, }, viewModel: { @@ -149,7 +149,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', { mptype: '', type: '', confid: '', - node: '' + node: '', }, formulas: { @@ -170,8 +170,8 @@ Ext.define('PVE.lxc.MountPointInputPanel', { }, isBindOrRoot: function(get) { return get('isBind') || get('isRoot'); - } - } + }, + }, }, column1: [ @@ -186,7 +186,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', { disabled: true, bind: { hidden: '{hasMP}', - disabled: '{hasMP}' + disabled: '{hasMP}', }, validator: function(value) { var me = this.up('inputpanel'); @@ -198,7 +198,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', { } /* returns a string above */ return true; - } + }, }, { xtype: 'pveDiskStorageSelector', @@ -211,8 +211,8 @@ Ext.define('PVE.lxc.MountPointInputPanel', { bind: { hidden: '{hideStorSelector}', disabled: '{hideStorSelector}', - nodename: '{node}' - } + nodename: '{node}', + }, }, { xtype: 'textfield', @@ -221,9 +221,9 @@ Ext.define('PVE.lxc.MountPointInputPanel', { fieldLabel: gettext('Disk image'), name: 'file', bind: { - hidden: '{!hideStorSelector}' - } - } + hidden: '{!hideStorSelector}', + }, + }, ], column2: [ @@ -237,8 +237,8 @@ Ext.define('PVE.lxc.MountPointInputPanel', { fieldLabel: gettext('Path'), bind: { hidden: '{isRoot}', - disabled: '{isRoot}' - } + disabled: '{isRoot}', + }, }, { xtype: 'proxmoxcheckbox', @@ -251,9 +251,9 @@ Ext.define('PVE.lxc.MountPointInputPanel', { bind: { hidden: '{isRoot}', disabled: '{isBindOrRoot}', - value: '{isIncludedInBackup}' - } - } + value: '{isIncludedInBackup}', + }, + }, ], advancedColumn1: [ @@ -262,14 +262,14 @@ Ext.define('PVE.lxc.MountPointInputPanel', { name: 'quota', defaultValue: 0, bind: { - disabled: '{!quota}' + disabled: '{!quota}', }, fieldLabel: gettext('Enable quota'), listeners: { disable: function() { this.reset(); - } - } + }, + }, }, { xtype: 'proxmoxcheckbox', @@ -277,9 +277,9 @@ Ext.define('PVE.lxc.MountPointInputPanel', { defaultValue: 0, bind: { hidden: '{isRoot}', - disabled: '{isRoot}' + disabled: '{isRoot}', }, - fieldLabel: gettext('Read-only') + fieldLabel: gettext('Read-only'), }, { xtype: 'proxmoxKVComboBox', @@ -290,11 +290,11 @@ Ext.define('PVE.lxc.MountPointInputPanel', { ['noatime', 'noatime'], ['nodev', 'nodev'], ['noexec', 'noexec'], - ['nosuid', 'nosuid'] + ['nosuid', 'nosuid'], ], multiSelect: true, value: [], - allowBlank: true + allowBlank: true, }, ], @@ -307,21 +307,21 @@ Ext.define('PVE.lxc.MountPointInputPanel', { comboItems: [ ['__default__', Proxmox.Utils.defaultText], ['1', Proxmox.Utils.enabledText], - ['0', Proxmox.Utils.disabledText] + ['0', Proxmox.Utils.disabledText], ], value: '__default__', bind: { - disabled: '{isBind}' + disabled: '{isBind}', }, - allowBlank: true + allowBlank: true, }, { xtype: 'proxmoxcheckbox', inputValue: '0', // reverses the logic name: 'replicate', - fieldLabel: gettext('Skip replication') - } - ] + fieldLabel: gettext('Skip replication'), + }, + ], }); Ext.define('PVE.lxc.MountPointEdit', { @@ -346,7 +346,7 @@ Ext.define('PVE.lxc.MountPointEdit', { nodename: nodename, unused: unused, unprivileged: me.unprivileged, - isCreate: me.isCreate + isCreate: me.isCreate, }); var subject; @@ -361,7 +361,7 @@ Ext.define('PVE.lxc.MountPointEdit', { Ext.apply(me, { subject: subject, defaultFocus: me.confid !== 'rootfs' ? 'textfield[name=mp]' : 'tool', - items: ipanel + items: ipanel, }); me.callParent(); @@ -383,7 +383,7 @@ Ext.define('PVE.lxc.MountPointEdit', { ipanel.setMountPoint(mp); me.isValid(); // trigger validation } - } + }, }); - } + }, }); diff --git a/www/manager6/lxc/MPResize.js b/www/manager6/lxc/MPResize.js index 430a1e32..73f6a9a7 100644 --- a/www/manager6/lxc/MPResize.js +++ b/www/manager6/lxc/MPResize.js @@ -20,7 +20,7 @@ Ext.define('PVE.window.MPResize', { var win = Ext.create('Proxmox.window.TaskViewer', { upid: upid }); win.show(); me.close(); - } + }, }); }, @@ -42,8 +42,8 @@ Ext.define('PVE.window.MPResize', { value: me.disk, fieldLabel: gettext('Disk'), vtype: 'StorageId', - allowBlank: false - } + allowBlank: false, + }, ]; me.hdsizesel = Ext.createWidget('numberfield', { @@ -53,7 +53,7 @@ Ext.define('PVE.window.MPResize', { decimalPrecision: 3, value: '0', fieldLabel: gettext('Size Increment') + ' (GiB)', - allowBlank: false + allowBlank: false, }); items.push(me.hdsizesel); @@ -63,9 +63,9 @@ Ext.define('PVE.window.MPResize', { border: false, fieldDefaults: { labelWidth: 120, - anchor: '100%' + anchor: '100%', }, - items: items + items: items, }); var form = me.formPanel.getForm(); @@ -80,7 +80,7 @@ Ext.define('PVE.window.MPResize', { var values = form.getValues(); me.resize_disk(me.disk, values.size); } - } + }, }); Ext.apply(me, { @@ -88,7 +88,7 @@ Ext.define('PVE.window.MPResize', { border: false, layout: 'fit', buttons: [ submitBtn ], - items: [ me.formPanel ] + items: [ me.formPanel ], }); @@ -98,5 +98,5 @@ Ext.define('PVE.window.MPResize', { return; } - } + }, }); diff --git a/www/manager6/lxc/Network.js b/www/manager6/lxc/Network.js index 7bb6ad72..7d75274a 100644 --- a/www/manager6/lxc/Network.js +++ b/www/manager6/lxc/Network.js @@ -84,7 +84,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { var idselector = { xtype: 'hidden', name: 'id', - value: me.ifname + value: me.ifname, }; me.column1 = [ @@ -113,7 +113,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { } // validator can return bool/string return true; - } + }, }, { xtype: 'textfield', @@ -122,7 +122,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { vtype: 'MacAddress', value: cdata.hwaddr, allowBlank: true, - emptyText: 'auto' + emptyText: 'auto', }, { xtype: 'PVE.form.BridgeSelector', @@ -130,12 +130,12 @@ Ext.define('PVE.lxc.NetworkInputPanel', { nodename: me.nodename, fieldLabel: gettext('Bridge'), value: cdata.bridge, - allowBlank: false + allowBlank: false, }, { xtype: 'pveVlanField', name: 'tag', - value: cdata.tag + value: cdata.tag, }, { xtype: 'numberfield', @@ -145,14 +145,14 @@ Ext.define('PVE.lxc.NetworkInputPanel', { maxValue: 10*1024, value: cdata.rate, emptyText: 'unlimited', - allowBlank: true + allowBlank: true, }, { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Firewall'), name: 'firewall', - value: cdata.firewall - } + value: cdata.firewall, + }, ]; var dhcp4 = (cdata.ip === 'dhcp'); @@ -172,14 +172,14 @@ Ext.define('PVE.lxc.NetworkInputPanel', { { layout: { type: 'hbox', - align: 'middle' + align: 'middle', }, border: false, margin: '0 0 5 0', items: [ { xtype: 'label', - text: 'IPv4:' // do not localize + text: 'IPv4:', // do not localize }, { xtype: 'radiofield', @@ -191,12 +191,12 @@ Ext.define('PVE.lxc.NetworkInputPanel', { listeners: { change: function(cb, value) { me.down('field[name=ip]').setEmptyText( - !!value ? Proxmox.Utils.NoneText : "" + !!value ? Proxmox.Utils.NoneText : "", ); me.down('field[name=ip]').setDisabled(!value); me.down('field[name=gw]').setDisabled(!value); - } - } + }, + }, }, { xtype: 'radiofield', @@ -204,9 +204,9 @@ Ext.define('PVE.lxc.NetworkInputPanel', { name: 'ipv4mode', inputValue: 'dhcp', checked: dhcp4, - margin: '0 0 0 10' - } - ] + margin: '0 0 0 10', + }, + ], }, { xtype: 'textfield', @@ -215,7 +215,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { value: cdata.ip, emptyText: dhcp4 ? '' : Proxmox.Utils.NoneText, disabled: dhcp4, - fieldLabel: 'IPv4/CIDR' // do not localize + fieldLabel: 'IPv4/CIDR', // do not localize }, { xtype: 'textfield', @@ -224,24 +224,24 @@ Ext.define('PVE.lxc.NetworkInputPanel', { vtype: 'IPAddress', disabled: dhcp4, fieldLabel: gettext('Gateway') + ' (IPv4)', - margin: '0 0 3 0' // override bottom margin to account for the menuseparator + margin: '0 0 3 0', // override bottom margin to account for the menuseparator }, { xtype: 'menuseparator', height: '3', - margin: '0' + margin: '0', }, { layout: { type: 'hbox', - align: 'middle' + align: 'middle', }, border: false, margin: '0 0 5 0', items: [ { xtype: 'label', - text: 'IPv6:' // do not localize + text: 'IPv6:', // do not localize }, { xtype: 'radiofield', @@ -253,12 +253,12 @@ Ext.define('PVE.lxc.NetworkInputPanel', { listeners: { change: function(cb, value) { me.down('field[name=ip6]').setEmptyText( - !!value ? Proxmox.Utils.NoneText : "" + !!value ? Proxmox.Utils.NoneText : "", ); me.down('field[name=ip6]').setDisabled(!value); me.down('field[name=gw6]').setDisabled(!value); - } - } + }, + }, }, { xtype: 'radiofield', @@ -266,7 +266,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { name: 'ipv6mode', inputValue: 'dhcp', checked: dhcp6, - margin: '0 0 0 10' + margin: '0 0 0 10', }, { xtype: 'radiofield', @@ -274,9 +274,9 @@ Ext.define('PVE.lxc.NetworkInputPanel', { name: 'ipv6mode', inputValue: 'auto', checked: auto6, - margin: '0 0 0 10' - } - ] + margin: '0 0 0 10', + }, + ], }, { xtype: 'textfield', @@ -285,7 +285,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { emptyText: dhcp6 || auto6 ? '' : Proxmox.Utils.NoneText, vtype: 'IP6CIDRAddress', disabled: (dhcp6 || auto6), - fieldLabel: 'IPv6/CIDR' // do not localize + fieldLabel: 'IPv6/CIDR', // do not localize }, { xtype: 'textfield', @@ -293,12 +293,12 @@ Ext.define('PVE.lxc.NetworkInputPanel', { vtype: 'IP6Address', value: cdata.gw6, disabled: (dhcp6 || auto6), - fieldLabel: gettext('Gateway') + ' (IPv6)' - } + fieldLabel: gettext('Gateway') + ' (IPv6)', + }, ]; me.callParent(); - } + }, }); Ext.define('PVE.lxc.NetworkEdit', { @@ -321,17 +321,17 @@ Ext.define('PVE.lxc.NetworkEdit', { ifname: me.ifname, nodename: me.nodename, dataCache: me.dataCache, - isCreate: me.isCreate + isCreate: me.isCreate, }); Ext.apply(me, { subject: gettext('Network Device') + ' (veth)', digest: me.dataCache.digest, - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); - } + }, }); Ext.define('PVE.lxc.NetworkView', { @@ -371,7 +371,7 @@ Ext.define('PVE.lxc.NetworkView', { }); me.store.loadData(records); me.down('button[name=addButton]').setDisabled((records.length >= 32)); - } + }, }); }, @@ -397,9 +397,9 @@ Ext.define('PVE.lxc.NetworkView', { sorters: [ { property : 'id', - direction: 'ASC' - } - ] + direction: 'ASC', + }, + ], }); var sm = Ext.create('Ext.selection.RowModel', {}); @@ -426,9 +426,9 @@ Ext.define('PVE.lxc.NetworkView', { }, failure: function (response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); - } + }, }); var run_editor = function() { @@ -445,7 +445,7 @@ Ext.define('PVE.lxc.NetworkView', { url: me.url, nodename: nodename, dataCache: me.dataCache, - ifname: rec.data.id + ifname: rec.data.id, }); win.on('destroy', me.load, me); win.show(); @@ -461,7 +461,7 @@ Ext.define('PVE.lxc.NetworkView', { } return true; }, - handler: run_editor + handler: run_editor, }); Ext.apply(me, { @@ -477,46 +477,46 @@ Ext.define('PVE.lxc.NetworkView', { url: me.url, nodename: nodename, isCreate: true, - dataCache: me.dataCache + dataCache: me.dataCache, }); win.on('destroy', me.load, me); win.show(); - } + }, }, remove_btn, - edit_btn + edit_btn, ], columns: [ { header: 'ID', width: 50, - dataIndex: 'id' + dataIndex: 'id', }, { header: gettext('Name'), width: 80, - dataIndex: 'name' + dataIndex: 'name', }, { header: gettext('Bridge'), width: 80, - dataIndex: 'bridge' + dataIndex: 'bridge', }, { header: gettext('Firewall'), width: 80, dataIndex: 'firewall', - renderer: Proxmox.Utils.format_boolean + renderer: Proxmox.Utils.format_boolean, }, { header: gettext('VLAN Tag'), width: 80, - dataIndex: 'tag' + dataIndex: 'tag', }, { header: gettext('MAC address'), width: 110, - dataIndex: 'hwaddr' + dataIndex: 'hwaddr', }, { header: gettext('IP address'), @@ -530,7 +530,7 @@ Ext.define('PVE.lxc.NetworkView', { } else { return rec.data.ip; } - } + }, }, { header: gettext('Gateway'), @@ -544,24 +544,24 @@ Ext.define('PVE.lxc.NetworkView', { } else { return rec.data.gw; } - } - } + }, + }, ], listeners: { activate: me.load, - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }); me.callParent(); - } + }, }, function() { Ext.define('pve-lxc-network', { extend: "Ext.data.Model", proxy: { type: 'memory' }, fields: [ 'id', 'name', 'hwaddr', 'bridge', - 'ip', 'gw', 'ip6', 'gw6', 'tag', 'firewall' ] + 'ip', 'gw', 'ip6', 'gw6', 'tag', 'firewall' ], }); }); diff --git a/www/manager6/lxc/Options.js b/www/manager6/lxc/Options.js index 42a76f3e..dfc07b59 100644 --- a/www/manager6/lxc/Options.js +++ b/www/manager6/lxc/Options.js @@ -33,9 +33,9 @@ Ext.define('PVE.lxc.Options', { name: 'onboot', uncheckedValue: 0, defaultValue: 0, - fieldLabel: gettext('Start at boot') - } - } : undefined + fieldLabel: gettext('Start at boot'), + }, + } : undefined, }, startup: { header: gettext('Start/Shutdown order'), @@ -44,16 +44,16 @@ Ext.define('PVE.lxc.Options', { editor: caps.vms['VM.Config.Options'] && caps.nodes['Sys.Modify'] ? { xtype: 'pveWindowStartupEdit', - onlineHelp: 'pct_startup_and_shutdown' - } : undefined + onlineHelp: 'pct_startup_and_shutdown', + } : undefined, }, ostype: { header: gettext('OS Type'), - defaultValue: Proxmox.Utils.unknownText + defaultValue: Proxmox.Utils.unknownText, }, arch: { header: gettext('Architecture'), - defaultValue: Proxmox.Utils.unknownText + defaultValue: Proxmox.Utils.unknownText, }, console: { header: '/dev/console', @@ -69,9 +69,9 @@ Ext.define('PVE.lxc.Options', { defaultValue: 1, deleteDefaultValue: true, checked: true, - fieldLabel: '/dev/console' - } - } : undefined + fieldLabel: '/dev/console', + }, + } : undefined, }, tty: { header: gettext('TTY count'), @@ -87,9 +87,9 @@ Ext.define('PVE.lxc.Options', { value: 2, fieldLabel: gettext('TTY count'), emptyText: gettext('Default'), - deleteEmpty: true - } - } : undefined + deleteEmpty: true, + }, + } : undefined, }, cmode: { header: gettext('Console mode'), @@ -106,11 +106,11 @@ Ext.define('PVE.lxc.Options', { ['__default__', Proxmox.Utils.defaultText + " (tty)"], ['tty', "/dev/tty[X]"], ['console', "/dev/console"], - ['shell', "shell"] + ['shell', "shell"], ], - fieldLabel: gettext('Console mode') - } - } : undefined + fieldLabel: gettext('Console mode'), + }, + } : undefined, }, protection: { header: gettext('Protection'), @@ -125,24 +125,24 @@ Ext.define('PVE.lxc.Options', { uncheckedValue: 0, defaultValue: 0, deleteDefaultValue: true, - fieldLabel: gettext('Enabled') - } - } : undefined + fieldLabel: gettext('Enabled'), + }, + } : undefined, }, unprivileged: { header: gettext('Unprivileged container'), renderer: Proxmox.Utils.format_boolean, - defaultValue: 0 + defaultValue: 0, }, features: { header: gettext('Features'), defaultValue: Proxmox.Utils.noneText, editor: Proxmox.UserName === 'root@pam' ? - 'PVE.lxc.FeaturesEdit' : undefined + 'PVE.lxc.FeaturesEdit' : undefined, }, hookscript: { - header: gettext('Hookscript') - } + header: gettext('Hookscript'), + }, }; var baseurl = 'nodes/' + nodename + '/lxc/' + vmid + '/config'; @@ -157,7 +157,7 @@ Ext.define('PVE.lxc.Options', { var rowdef = rows[rec.data.key]; return !!rowdef.editor; }, - handler: function() { me.run_editor(); } + handler: function() { me.run_editor(); }, }); var revert_btn = new PVE.button.PendingRevert(); @@ -187,12 +187,12 @@ Ext.define('PVE.lxc.Options', { tbar: [ edit_btn, revert_btn ], rows: rows, editorConfig: { - url: '/api2/extjs/' + baseurl + url: '/api2/extjs/' + baseurl, }, listeners: { itemdblclick: me.run_editor, - selectionchange: set_button_status - } + selectionchange: set_button_status, + }, }); me.callParent(); @@ -205,6 +205,6 @@ Ext.define('PVE.lxc.Options', { set_button_status(); }); - } + }, }); diff --git a/www/manager6/lxc/ResourceEdit.js b/www/manager6/lxc/ResourceEdit.js index 0c4dbce7..fb1a05fc 100644 --- a/www/manager6/lxc/ResourceEdit.js +++ b/www/manager6/lxc/ResourceEdit.js @@ -8,13 +8,13 @@ Ext.define('PVE.lxc.MemoryEdit', { Ext.apply(me, { subject: gettext('Memory'), - items: Ext.create('PVE.lxc.MemoryInputPanel') + items: Ext.create('PVE.lxc.MemoryInputPanel'), }); me.callParent(); me.load(); - } + }, }); @@ -26,13 +26,13 @@ Ext.define('PVE.lxc.CPUEdit', { Ext.apply(me, { subject: gettext('CPU'), - items: Ext.create('PVE.lxc.CPUInputPanel') + items: Ext.create('PVE.lxc.CPUInputPanel'), }); me.callParent(); me.load(); - } + }, }); Ext.define('PVE.lxc.CPUInputPanel', { @@ -63,8 +63,8 @@ Ext.define('PVE.lxc.CPUInputPanel', { step: 1, fieldLabel: gettext('CPU limit'), allowBlank: true, - emptyText: gettext('unlimited') - } + emptyText: gettext('unlimited'), + }, ], advancedColumn2: [ @@ -76,8 +76,8 @@ Ext.define('PVE.lxc.CPUInputPanel', { minValue: 8, maxValue: 500000, labelWidth: labelWidth, - allowBlank: false - } + allowBlank: false, + }, ], initComponent: function() { @@ -93,12 +93,12 @@ Ext.define('PVE.lxc.CPUInputPanel', { fieldLabel: gettext('Cores'), allowBlank: true, deleteEmpty: true, - emptyText: gettext('unlimited') - } + emptyText: gettext('unlimited'), + }, ]; me.callParent(); - } + }, }); Ext.define('PVE.lxc.MemoryInputPanel', { @@ -121,7 +121,7 @@ Ext.define('PVE.lxc.MemoryInputPanel', { step: 32, fieldLabel: gettext('Memory') + ' (MiB)', labelWidth: labelWidth, - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxintegerfield', @@ -131,8 +131,8 @@ Ext.define('PVE.lxc.MemoryInputPanel', { step: 32, fieldLabel: gettext('Swap') + ' (MiB)', labelWidth: labelWidth, - allowBlank: false - } + allowBlank: false, + }, ]; if (me.insideWizard) { @@ -142,5 +142,5 @@ Ext.define('PVE.lxc.MemoryInputPanel', { } me.callParent(); - } + }, }); diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js index ed82e418..c4b902cd 100644 --- a/www/manager6/lxc/Resources.js +++ b/www/manager6/lxc/Resources.js @@ -43,7 +43,7 @@ Ext.define('PVE.lxc.RessourceView', { group: 1, renderer: function(value) { return Proxmox.Utils.format_size(value*1024*1024); - } + }, }, swap: { header: gettext('Swap'), @@ -53,7 +53,7 @@ Ext.define('PVE.lxc.RessourceView', { group: 2, renderer: function(value) { return Proxmox.Utils.format_size(value*1024*1024); - } + }, }, cores: { header: gettext('Cores'), @@ -79,24 +79,24 @@ Ext.define('PVE.lxc.RessourceView', { res += ' [cpuunits=' + cpuunits + ']'; } return res; - } + }, }, rootfs: { header: gettext('Root Disk'), defaultValue: Proxmox.Utils.noneText, editor: mpeditor, tdCls: 'pve-itype-icon-storage', - group: 4 + group: 4, }, cpulimit: { - visible: false + visible: false, }, cpuunits: { - visible: false + visible: false, }, unprivileged: { - visible: false - } + visible: false, + }, }; PVE.Utils.forEachMP(function(bus, i) { @@ -114,7 +114,7 @@ Ext.define('PVE.lxc.RessourceView', { order: i, tdCls: 'pve-itype-icon-storage', editor: mpeditor, - header: header + header: header, }; }, true); @@ -131,7 +131,7 @@ Ext.define('PVE.lxc.RessourceView', { var win = Ext.create('PVE.window.MPResize', { disk: rec.data.key, nodename: nodename, - vmid: vmid + vmid: vmid, }); win.show(); @@ -143,11 +143,11 @@ Ext.define('PVE.lxc.RessourceView', { waitMsgTarget: me, method: 'PUT', params: { - 'delete': rec.data.key + 'delete': rec.data.key, }, failure: function (response, opts) { Ext.Msg.alert('Error', response.htmlStatus); - } + }, }); }; @@ -160,7 +160,7 @@ Ext.define('PVE.lxc.RessourceView', { disk: rec.data.key, nodename: nodename, vmid: vmid, - type: 'lxc' + type: 'lxc', }); win.show(); @@ -179,14 +179,14 @@ Ext.define('PVE.lxc.RessourceView', { var rowdef = rows[rec.data.key]; return !!rowdef.editor; }, - handler: function() { me.run_editor(); } + handler: function() { me.run_editor(); }, }); var resize_btn = new Proxmox.button.Button({ text: gettext('Resize disk'), selModel: me.selModel, disabled: true, - handler: run_resize + handler: run_resize, }); var remove_btn = new Proxmox.button.Button({ @@ -203,7 +203,7 @@ Ext.define('PVE.lxc.RessourceView', { return msg; }, - handler: run_remove + handler: run_remove, }); var move_btn = new Proxmox.button.Button({ @@ -211,7 +211,7 @@ Ext.define('PVE.lxc.RessourceView', { selModel: me.selModel, disabled: true, dangerous: true, - handler: run_move + handler: run_move, }); var revert_btn = new PVE.button.PendingRevert(); @@ -293,31 +293,31 @@ Ext.define('PVE.lxc.RessourceView', { var win = Ext.create('PVE.lxc.MountPointEdit', { url: '/api2/extjs/' + baseurl, unprivileged: me.getObjectValue('unprivileged'), - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); win.on('destroy', me.reload, me); win.show(); - } - } - ] - }) + }, + }, + ], + }), }, edit_btn, remove_btn, resize_btn, move_btn, - revert_btn + revert_btn, ], rows: rows, sorterFn: sorterFn, editorConfig: { pveSelNode: me.pveSelNode, - url: '/api2/extjs/' + baseurl + url: '/api2/extjs/' + baseurl, }, listeners: { itemdblclick: me.run_editor, - selectionchange: set_button_status - } + selectionchange: set_button_status, + }, }); me.callParent(); @@ -331,5 +331,5 @@ Ext.define('PVE.lxc.RessourceView', { }); Ext.apply(me.editorConfig, { unprivileged: me.getObjectValue('unprivileged') }); - } + }, }); diff --git a/www/manager6/menu/MenuItem.js b/www/manager6/menu/MenuItem.js index 2c1beabd..67e993ef 100644 --- a/www/manager6/menu/MenuItem.js +++ b/www/manager6/menu/MenuItem.js @@ -36,11 +36,11 @@ Ext.define('PVE.menu.Item', { if (btn === 'yes') { Ext.callback(fn, me.scope, [me, e], 0, me); } - } + }, }); } else { Ext.callback(fn, me.scope, [me, e], 0, me); } }; - } + }, }); diff --git a/www/manager6/menu/TemplateMenu.js b/www/manager6/menu/TemplateMenu.js index 23240cca..925638a0 100644 --- a/www/manager6/menu/TemplateMenu.js +++ b/www/manager6/menu/TemplateMenu.js @@ -30,7 +30,7 @@ Ext.define('PVE.menu.TemplateMenu', { method: 'POST', failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); }; @@ -44,10 +44,10 @@ Ext.define('PVE.menu.TemplateMenu', { var win = Ext.create('PVE.window.Migrate', { vmtype: guestType, nodename: nodename, - vmid: vmid + vmid: vmid, }); win.show(); - } + }, }, { text: gettext('Clone'), @@ -57,13 +57,13 @@ Ext.define('PVE.menu.TemplateMenu', { nodename: nodename, guestType: guestType, vmid: vmid, - isTemplate: template + isTemplate: template, }); win.show(); - } - } + }, + }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/node/ACME.js b/www/manager6/node/ACME.js index b6ecf3e7..cfe9cc12 100644 --- a/www/manager6/node/ACME.js +++ b/www/manager6/node/ACME.js @@ -26,7 +26,7 @@ Ext.define('PVE.node.ACMEAccountCreate', { name: 'contact', vtype: 'email', allowBlank: false, - fieldLabel: gettext('E-Mail') + fieldLabel: gettext('E-Mail'), }, { xtype: 'proxmoxComboGrid', @@ -41,26 +41,26 @@ Ext.define('PVE.node.ACMEAccountCreate', { idProperty: ['name'], proxy: { type: 'proxmox', - url: '/api2/json/cluster/acme/directories' + url: '/api2/json/cluster/acme/directories', }, sorters: { property: 'name', - order: 'ASC' - } + order: 'ASC', + }, }, listConfig: { columns: [ { header: gettext('Name'), dataIndex: 'name', - flex: 1 + flex: 1, }, { header: gettext('URL'), dataIndex: 'url', - flex: 1 - } - ] + flex: 1, + }, + ], }, listeners: { change: function(combogrid, value) { @@ -82,7 +82,7 @@ Ext.define('PVE.node.ACMEAccountCreate', { url: '/cluster/acme/tos', method: 'GET', params: { - directory: value + directory: value, }, success: function(response, opt) { field.setValue(response.result.data); @@ -91,21 +91,21 @@ Ext.define('PVE.node.ACMEAccountCreate', { }, failure: function(response, opt) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); - } - } + }, + }, }, { xtype: 'displayfield', itemId: 'tos_url_display', renderer: PVE.Utils.render_optional_url, - name: 'tos_url_display' + name: 'tos_url_display', }, { xtype: 'hidden', itemId: 'tos_url', - name: 'tos_url' + name: 'tos_url', }, { xtype: 'proxmoxcheckbox', @@ -117,9 +117,9 @@ Ext.define('PVE.node.ACMEAccountCreate', { return true; } return false; - } + }, }, - ] + ], }); @@ -128,7 +128,7 @@ Ext.define('PVE.node.ACMEAccountView', { width: 600, fieldDefaults: { - labelWidth: 140 + labelWidth: 140, }, title: gettext('Account'), @@ -137,30 +137,30 @@ Ext.define('PVE.node.ACMEAccountView', { { xtype: 'displayfield', fieldLabel: gettext('E-Mail'), - name: 'email' + name: 'email', }, { xtype: 'displayfield', fieldLabel: gettext('Created'), - name: 'createdAt' + name: 'createdAt', }, { xtype: 'displayfield', fieldLabel: gettext('Status'), - name: 'status' + name: 'status', }, { xtype: 'displayfield', fieldLabel: gettext('Directory'), renderer: PVE.Utils.render_optional_url, - name: 'directory' + name: 'directory', }, { xtype: 'displayfield', fieldLabel: gettext('Terms of Services'), renderer: PVE.Utils.render_optional_url, - name: 'tos' - } + name: 'tos', + }, ], initComponent: function() { @@ -184,9 +184,9 @@ Ext.define('PVE.node.ACMEAccountView', { data.createdAt = data.account.createdAt; data.status = data.account.status; me.setValues(data); - } + }, }); - } + }, }); Ext.define('PVE.node.ACMEDomainEdit', { diff --git a/www/manager6/node/Certificates.js b/www/manager6/node/Certificates.js index 0c5dfc68..f3a2d68b 100644 --- a/www/manager6/node/Certificates.js +++ b/www/manager6/node/Certificates.js @@ -11,17 +11,17 @@ Ext.define('PVE.node.CertificateView', { xtype: 'pveCertView', border: 0, cbind: { - nodename: '{nodename}' - } + nodename: '{nodename}', + }, }, { xtype: 'pveACMEView', border: 0, cbind: { - nodename: '{nodename}' - } - } - ] + nodename: '{nodename}', + }, + }, + ], }); @@ -31,7 +31,7 @@ Ext.define('PVE.node.CertificateViewer', { title: gettext('Certificate'), fieldDefaults: { - labelWidth: 120 + labelWidth: 120, }, width: 800, resizable: true, @@ -40,50 +40,50 @@ Ext.define('PVE.node.CertificateViewer', { { xtype: 'displayfield', fieldLabel: gettext('Name'), - name: 'filename' + name: 'filename', }, { xtype: 'displayfield', fieldLabel: gettext('Fingerprint'), - name: 'fingerprint' + name: 'fingerprint', }, { xtype: 'displayfield', fieldLabel: gettext('Issuer'), - name: 'issuer' + name: 'issuer', }, { xtype: 'displayfield', fieldLabel: gettext('Subject'), - name: 'subject' + name: 'subject', }, { xtype: 'displayfield', fieldLabel: gettext('Public Key Type'), - name: 'public-key-type' + name: 'public-key-type', }, { xtype: 'displayfield', fieldLabel: gettext('Public Key Size'), - name: 'public-key-bits' + name: 'public-key-bits', }, { xtype: 'displayfield', fieldLabel: gettext('Valid Since'), renderer: Proxmox.Utils.render_timestamp, - name: 'notbefore' + name: 'notbefore', }, { xtype: 'displayfield', fieldLabel: gettext('Expires'), renderer: Proxmox.Utils.render_timestamp, - name: 'notafter' + name: 'notafter', }, { xtype: 'displayfield', fieldLabel: gettext('Subject Alternative Names'), name: 'san', - renderer: PVE.Utils.render_san + renderer: PVE.Utils.render_san, }, { xtype: 'textarea', @@ -91,8 +91,8 @@ Ext.define('PVE.node.CertificateViewer', { grow: true, growMax: 200, fieldLabel: gettext('Certificate'), - name: 'pem' - } + name: 'pem', + }, ], initComponent: function() { @@ -122,9 +122,9 @@ Ext.define('PVE.node.CertificateViewer', { } }); } - } + }, }); - } + }, }); Ext.define('PVE.node.CertUpload', { @@ -157,7 +157,7 @@ Ext.define('PVE.node.CertUpload', { labelAlign: 'top', emptyText: gettext('No change'), name: 'key', - xtype: 'textarea' + xtype: 'textarea', }, { xtype: 'filebutton', @@ -172,19 +172,19 @@ Ext.define('PVE.node.CertUpload', { }); }); btn.reset(); - } - } + }, + }, }, { xtype: 'box', - autoEl: 'hr' + autoEl: 'hr', }, { fieldLabel: gettext('Certificate Chain'), labelAlign: 'top', allowBlank: false, name: 'certificates', - xtype: 'textarea' + xtype: 'textarea', }, { xtype: 'filebutton', @@ -199,19 +199,19 @@ Ext.define('PVE.node.CertUpload', { }); }); btn.reset(); - } - } + }, + }, }, { xtype: 'hidden', name: 'restart', - value: '1' + value: '1', }, { xtype: 'hidden', name: 'force', - value: '1' - } + value: '1', + }, ], initComponent: function() { @@ -224,14 +224,14 @@ Ext.define('PVE.node.CertUpload', { me.url = '/nodes/' + me.nodename + '/certificates/custom'; me.callParent(); - } + }, }); Ext.define('pve-certificate', { extend: 'Ext.data.Model', fields: [ 'filename', 'fingerprint', 'issuer', 'notafter', 'notbefore', 'subject', 'san', 'public-key-bits', 'public-key-type' ], - idProperty: 'filename' + idProperty: 'filename', }); Ext.define('PVE.node.Certificates', { @@ -245,11 +245,11 @@ Ext.define('PVE.node.Certificates', { handler: function() { var me = this.up('grid'); var win = Ext.create('PVE.node.CertUpload', { - nodename: me.nodename + nodename: me.nodename, }); win.show(); win.on('destroy', me.reload, me); - } + }, }, { xtype: 'button', @@ -270,9 +270,9 @@ Ext.define('PVE.node.Certificates', { }, failure: function(response, opt) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); - } + }, }, '-', { @@ -283,66 +283,66 @@ Ext.define('PVE.node.Certificates', { handler: function() { var me = this.up('grid'); me.view_certificate(); - } - } + }, + }, ], columns: [ { header: gettext('File'), width: 150, - dataIndex: 'filename' + dataIndex: 'filename', }, { header: gettext('Issuer'), flex: 1, - dataIndex: 'issuer' + dataIndex: 'issuer', }, { header: gettext('Subject'), flex: 1, - dataIndex: 'subject' + dataIndex: 'subject', }, { header: gettext('Public Key Alogrithm'), flex: 1, dataIndex: 'public-key-type', - hidden: true + hidden: true, }, { header: gettext('Public Key Size'), flex: 1, dataIndex: 'public-key-bits', - hidden: true + hidden: true, }, { header: gettext('Valid Since'), width: 150, dataIndex: 'notbefore', - renderer: Proxmox.Utils.render_timestamp + renderer: Proxmox.Utils.render_timestamp, }, { header: gettext('Expires'), width: 150, dataIndex: 'notafter', - renderer: Proxmox.Utils.render_timestamp + renderer: Proxmox.Utils.render_timestamp, }, { header: gettext('Subject Alternative Names'), flex: 1, dataIndex: 'san', - renderer: PVE.Utils.render_san + renderer: PVE.Utils.render_san, }, { header: gettext('Fingerprint'), dataIndex: 'fingerprint', - hidden: true + hidden: true, }, { header: gettext('PEM'), dataIndex: 'pem', - hidden: true - } + hidden: true, + }, ], reload: function() { @@ -365,13 +365,13 @@ Ext.define('PVE.node.Certificates', { } var win = Ext.create('PVE.node.CertificateViewer', { cert: selection[0].data.filename, - nodename : me.nodename + nodename : me.nodename, }); win.show(); }, listeners: { - itemdblclick: 'view_certificate' + itemdblclick: 'view_certificate', }, initComponent: function() { @@ -386,13 +386,13 @@ Ext.define('PVE.node.Certificates', { model: 'pve-certificate', proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/certificates/info' - } + url: '/api2/json/nodes/' + me.nodename + '/certificates/info', + }, }); me.store = { type: 'diff', - rstore: me.rstore + rstore: me.rstore, }; me.callParent(); @@ -400,5 +400,5 @@ Ext.define('PVE.node.Certificates', { me.mon(me.rstore, 'load', me.set_button_status, me); me.rstore.startUpdate(); me.on('destroy', me.rstore.stopUpdate, me.rstore); - } + }, }); diff --git a/www/manager6/node/CmdMenu.js b/www/manager6/node/CmdMenu.js index f718f69a..b650bfa0 100644 --- a/www/manager6/node/CmdMenu.js +++ b/www/manager6/node/CmdMenu.js @@ -12,10 +12,10 @@ Ext.define('PVE.node.CmdMenu', { handler: function() { var me = this.up('menu'); var wiz = Ext.create('PVE.qemu.CreateWizard', { - nodename: me.nodename + nodename: me.nodename, }); wiz.show(); - } + }, }, { text: gettext('Create CT'), @@ -24,10 +24,10 @@ Ext.define('PVE.node.CmdMenu', { handler: function() { var me = this.up('menu'); var wiz = Ext.create('PVE.lxc.CreateWizard', { - nodename: me.nodename + nodename: me.nodename, }); wiz.show(); - } + }, }, { xtype: 'menuseparator' }, { @@ -40,10 +40,10 @@ Ext.define('PVE.node.CmdMenu', { nodename: me.nodename, title: gettext('Bulk Start'), btnText: gettext('Start'), - action: 'startall' + action: 'startall', }); win.show(); - } + }, }, { text: gettext('Bulk Stop'), @@ -55,10 +55,10 @@ Ext.define('PVE.node.CmdMenu', { nodename: me.nodename, title: gettext('Bulk Stop'), btnText: gettext('Stop'), - action: 'stopall' + action: 'stopall', }); win.show(); - } + }, }, { text: gettext('Bulk Migrate'), @@ -70,10 +70,10 @@ Ext.define('PVE.node.CmdMenu', { nodename: me.nodename, title: gettext('Bulk Migrate'), btnText: gettext('Migrate'), - action: 'migrateall' + action: 'migrateall', }); win.show(); - } + }, }, { xtype: 'menuseparator' }, { @@ -83,7 +83,7 @@ Ext.define('PVE.node.CmdMenu', { handler: function() { var me = this.up('menu'); PVE.Utils.openDefaultConsoleWindow(true, 'shell', undefined, me.nodename, undefined); - } + }, }, { xtype: 'menuseparator' }, { @@ -103,12 +103,12 @@ Ext.define('PVE.node.CmdMenu', { Ext.Msg.show({ title: 'Success', icon: Ext.Msg.INFO, - msg: Ext.String.format(gettext("Wake on LAN packet send for '{0}': '{1}'"), me.nodename, response.result.data) + msg: Ext.String.format(gettext("Wake on LAN packet send for '{0}': '{1}'"), me.nodename, response.result.data), }); - } + }, }); - } - } + }, + }, ], initComponent: function() { @@ -142,5 +142,5 @@ Ext.define('PVE.node.CmdMenu', { if (me.pveSelNode.data.running) { me.getComponent('wakeonlan').setDisabled(true); } - } + }, }); diff --git a/www/manager6/node/Directory.js b/www/manager6/node/Directory.js index 6e2e3c2f..646f6e46 100644 --- a/www/manager6/node/Directory.js +++ b/www/manager6/node/Directory.js @@ -27,36 +27,36 @@ Ext.define('PVE.node.CreateDirectory', { nodename: me.nodename, diskType: 'unused', fieldLabel: gettext('Disk'), - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxKVComboBox', comboItems: [ ['ext4', 'ext4'], - ['xfs', 'xfs'] + ['xfs', 'xfs'], ], fieldLabel: gettext('Filesystem'), name: 'filesystem', value: '', - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxtextfield', name: 'name', fieldLabel: gettext('Name'), - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxcheckbox', name: 'add_storage', fieldLabel: gettext('Add Storage'), - value: '1' - } - ] + value: '1', + }, + ], }); me.callParent(); - } + }, }); Ext.define('PVE.node.Directorylist', { @@ -69,28 +69,28 @@ Ext.define('PVE.node.Directorylist', { { text: gettext('Path'), dataIndex: 'path', - flex: 1 + flex: 1, }, { header: gettext('Device'), flex: 1, - dataIndex: 'device' + dataIndex: 'device', }, { header: gettext('Type'), width: 100, - dataIndex: 'type' + dataIndex: 'type', }, { header: gettext('Options'), width: 100, - dataIndex: 'options' + dataIndex: 'options', }, { header: gettext('Unit File'), hidden: true, - dataIndex: 'unitfile' - } + dataIndex: 'unitfile', + }, ], rootVisible: false, @@ -103,18 +103,18 @@ Ext.define('PVE.node.Directorylist', { handler: function() { var me = this.up('panel'); me.reload(); - } + }, }, { text: gettext('Create') + ': Directory', handler: function() { var me = this.up('panel'); var win = Ext.create('PVE.node.CreateDirectory', { - nodename: me.nodename + nodename: me.nodename, }).show(); win.on('destroy', function() { me.reload(); }); - } - } + }, + }, ], reload: function() { @@ -127,7 +127,7 @@ Ext.define('PVE.node.Directorylist', { activate: function() { var me = this; me.reload(); - } + }, }, initComponent: function() { @@ -143,16 +143,16 @@ Ext.define('PVE.node.Directorylist', { fields: ['path', 'device', 'type', 'options', 'unitfile' ], proxy: { type: 'proxmox', - url: "/api2/json/nodes/" + me.nodename + '/disks/directory' + url: "/api2/json/nodes/" + me.nodename + '/disks/directory', }, - sorters: 'path' - } + sorters: 'path', + }, }); me.callParent(); Proxmox.Utils.monStoreErrors(me, me.getStore(), true); me.reload(); - } + }, }); diff --git a/www/manager6/node/LVM.js b/www/manager6/node/LVM.js index f1e068b2..f437a2bc 100644 --- a/www/manager6/node/LVM.js +++ b/www/manager6/node/LVM.js @@ -27,25 +27,25 @@ Ext.define('PVE.node.CreateLVM', { nodename: me.nodename, diskType: 'unused', fieldLabel: gettext('Disk'), - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxtextfield', name: 'name', fieldLabel: gettext('Name'), - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxcheckbox', name: 'add_storage', fieldLabel: gettext('Add Storage'), - value: '1' - } - ] + value: '1', + }, + ], }); me.callParent(); - } + }, }); Ext.define('PVE.node.LVMList', { @@ -59,13 +59,13 @@ Ext.define('PVE.node.LVMList', { xtype: 'treecolumn', text: gettext('Name'), dataIndex: 'name', - flex: 1 + flex: 1, }, { text: gettext('Number of LVs'), dataIndex: 'lvcount', width: 150, - align: 'right' + align: 'right', }, { header: gettext('Usage'), @@ -74,8 +74,8 @@ Ext.define('PVE.node.LVMList', { tdCls: 'x-progressbar-default-cell', xtype: 'widgetcolumn', widget: { - xtype: 'pveProgressBar' - } + xtype: 'pveProgressBar', + }, }, { header: gettext('Size'), @@ -83,7 +83,7 @@ Ext.define('PVE.node.LVMList', { align: 'right', sortable: true, renderer: Proxmox.Utils.format_size, - dataIndex: 'size' + dataIndex: 'size', }, { header: gettext('Free'), @@ -91,8 +91,8 @@ Ext.define('PVE.node.LVMList', { align: 'right', sortable: true, renderer: Proxmox.Utils.format_size, - dataIndex: 'free' - } + dataIndex: 'free', + }, ], rootVisible: false, @@ -105,7 +105,7 @@ Ext.define('PVE.node.LVMList', { handler: function() { var me = this.up('panel'); me.reload(); - } + }, }, { text: gettext('Create') + ': Volume Group', @@ -115,10 +115,10 @@ Ext.define('PVE.node.LVMList', { nodename: me.nodename, taskDone: function() { me.reload(); - } + }, }).show(); - } - } + }, + }, ], reload: function() { @@ -135,7 +135,7 @@ Ext.define('PVE.node.LVMList', { sm.deselectAll(); me.setRootNode(response.result.data); me.expandAll(); - } + }, }); }, @@ -143,7 +143,7 @@ Ext.define('PVE.node.LVMList', { activate: function() { var me = this; me.reload(); - } + }, }, initComponent: function() { @@ -166,22 +166,22 @@ Ext.define('PVE.node.LVMList', { var txt = 'fa x-fa-tree fa-'; txt += (data.leaf) ? 'hdd-o' : 'object-group'; return txt; - } + }, }, { type: 'number', name: 'usage', calculate: function(data) { return ((data.size-data.free)/data.size); - } - } + }, + }, ], - sorters: 'name' + sorters: 'name', }); me.callParent(); me.reload(); - } + }, }); diff --git a/www/manager6/node/LVMThin.js b/www/manager6/node/LVMThin.js index 8ddf3bd5..0f7b70ba 100644 --- a/www/manager6/node/LVMThin.js +++ b/www/manager6/node/LVMThin.js @@ -27,25 +27,25 @@ Ext.define('PVE.node.CreateLVMThin', { nodename: me.nodename, diskType: 'unused', fieldLabel: gettext('Disk'), - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxtextfield', name: 'name', fieldLabel: gettext('Name'), - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxcheckbox', name: 'add_storage', fieldLabel: gettext('Add Storage'), - value: '1' - } - ] + value: '1', + }, + ], }); me.callParent(); - } + }, }); Ext.define('PVE.node.LVMThinList', { @@ -59,7 +59,7 @@ Ext.define('PVE.node.LVMThinList', { { text: gettext('Name'), dataIndex: 'lv', - flex: 1 + flex: 1, }, { header: gettext('Usage'), @@ -68,8 +68,8 @@ Ext.define('PVE.node.LVMThinList', { tdCls: 'x-progressbar-default-cell', xtype: 'widgetcolumn', widget: { - xtype: 'pveProgressBar' - } + xtype: 'pveProgressBar', + }, }, { header: gettext('Size'), @@ -77,7 +77,7 @@ Ext.define('PVE.node.LVMThinList', { align: 'right', sortable: true, renderer: Proxmox.Utils.format_size, - dataIndex: 'lv_size' + dataIndex: 'lv_size', }, { header: gettext('Used'), @@ -85,7 +85,7 @@ Ext.define('PVE.node.LVMThinList', { align: 'right', sortable: true, renderer: Proxmox.Utils.format_size, - dataIndex: 'used' + dataIndex: 'used', }, { header: gettext('Metadata Usage'), @@ -94,8 +94,8 @@ Ext.define('PVE.node.LVMThinList', { tdCls: 'x-progressbar-default-cell', xtype: 'widgetcolumn', widget: { - xtype: 'pveProgressBar' - } + xtype: 'pveProgressBar', + }, }, { header: gettext('Metadata Size'), @@ -103,7 +103,7 @@ Ext.define('PVE.node.LVMThinList', { align: 'right', sortable: true, renderer: Proxmox.Utils.format_size, - dataIndex: 'metadata_size' + dataIndex: 'metadata_size', }, { header: gettext('Metadata Used'), @@ -111,8 +111,8 @@ Ext.define('PVE.node.LVMThinList', { align: 'right', sortable: true, renderer: Proxmox.Utils.format_size, - dataIndex: 'metadata_used' - } + dataIndex: 'metadata_used', + }, ], rootVisible: false, @@ -125,7 +125,7 @@ Ext.define('PVE.node.LVMThinList', { handler: function() { var me = this.up('panel'); me.reload(); - } + }, }, { text: gettext('Create') + ': Thinpool', @@ -135,10 +135,10 @@ Ext.define('PVE.node.LVMThinList', { nodename: me.nodename, taskDone: function() { me.reload(); - } + }, }).show(); - } - } + }, + }, ], reload: function() { @@ -151,7 +151,7 @@ Ext.define('PVE.node.LVMThinList', { activate: function() { var me = this; me.reload(); - } + }, }, initComponent: function() { @@ -170,28 +170,28 @@ Ext.define('PVE.node.LVMThinList', { name: 'usage', calculate: function(data) { return data.used/data.lv_size; - } + }, }, { type: 'number', name: 'metadata_usage', calculate: function(data) { return data.metadata_used/data.metadata_size; - } - } + }, + }, ], proxy: { type: 'proxmox', - url: "/api2/json/nodes/" + me.nodename + '/disks/lvmthin' + url: "/api2/json/nodes/" + me.nodename + '/disks/lvmthin', }, - sorters: 'lv' - } + sorters: 'lv', + }, }); me.callParent(); Proxmox.Utils.monStoreErrors(me, me.getStore(), true); me.reload(); - } + }, }); diff --git a/www/manager6/node/StatusView.js b/www/manager6/node/StatusView.js index c9c8b909..8b62590a 100644 --- a/www/manager6/node/StatusView.js +++ b/www/manager6/node/StatusView.js @@ -10,14 +10,14 @@ Ext.define('PVE.node.StatusView', { columns: 2, tableAttrs: { style: { - width: '100%' - } - } + width: '100%', + }, + }, }, defaults: { xtype: 'pveInfoWidget', - padding: '0 15 5 15' + padding: '0 15 5 15', }, items: [ @@ -27,26 +27,26 @@ Ext.define('PVE.node.StatusView', { title: gettext('CPU usage'), valueField: 'cpu', maxField: 'cpuinfo', - renderer: PVE.Utils.render_node_cpu_usage + renderer: PVE.Utils.render_node_cpu_usage, }, { itemId: 'wait', iconCls: 'fa fa-fw fa-clock-o', title: gettext('IO delay'), valueField: 'wait', - rowspan: 2 + rowspan: 2, }, { itemId: 'load', iconCls: 'fa fa-fw fa-tasks', title: gettext('Load average'), printBar: false, - textField: 'loadavg' + textField: 'loadavg', }, { xtype: 'box', colspan: 2, - padding: '0 0 20 0' + padding: '0 0 20 0', }, { iconCls: 'fa fa-fw pve-itype-icon-memory pve-icon', @@ -54,7 +54,7 @@ Ext.define('PVE.node.StatusView', { title: gettext('RAM usage'), valueField: 'memory', maxField: 'memory', - renderer: PVE.Utils.render_node_size_usage + renderer: PVE.Utils.render_node_size_usage, }, { itemId: 'ksm', @@ -64,7 +64,7 @@ Ext.define('PVE.node.StatusView', { renderer: function(record) { return PVE.Utils.render_size(record.shared); }, - padding: '0 15 10 15' + padding: '0 15 10 15', }, { iconCls: 'fa fa-fw fa-hdd-o', @@ -72,7 +72,7 @@ Ext.define('PVE.node.StatusView', { title: gettext('HD space') + '(root)', valueField: 'rootfs', maxField: 'rootfs', - renderer: PVE.Utils.render_node_size_usage + renderer: PVE.Utils.render_node_size_usage, }, { iconCls: 'fa fa-fw fa-refresh', @@ -81,12 +81,12 @@ Ext.define('PVE.node.StatusView', { title: gettext('SWAP usage'), valueField: 'swap', maxField: 'swap', - renderer: PVE.Utils.render_node_size_usage + renderer: PVE.Utils.render_node_size_usage, }, { xtype: 'box', colspan: 2, - padding: '0 0 20 0' + padding: '0 0 20 0', }, { itemId: 'cpus', @@ -102,7 +102,7 @@ Ext.define('PVE.node.StatusView', { gettext('Socket') ) + ")"; }, - value: '' + value: '', }, { itemId: 'kversion', @@ -110,7 +110,7 @@ Ext.define('PVE.node.StatusView', { title: gettext('Kernel Version'), printBar: false, textField: 'kversion', - value: '' + value: '', }, { itemId: 'version', @@ -118,14 +118,14 @@ Ext.define('PVE.node.StatusView', { printBar: false, title: gettext('PVE Manager Version'), textField: 'pveversion', - value: '' - } + value: '', + }, ], updateTitle: function() { var me = this; var uptime = Proxmox.Utils.render_uptime(me.getRecordValue('uptime')); me.setTitle(me.pveSelNode.data.node + ' (' + gettext('Uptime') + ': ' + uptime + ')'); - } + }, }); diff --git a/www/manager6/node/Summary.js b/www/manager6/node/Summary.js index 3fbd187e..605385af 100644 --- a/www/manager6/node/Summary.js +++ b/www/manager6/node/Summary.js @@ -20,8 +20,8 @@ Ext.define('PVE.node.Summary', { style: { 'background-color': 'white', 'white-space': 'pre', - 'font-family': 'monospace' - } + 'font-family': 'monospace', + }, }); var win = Ext.create('Ext.window.Window', { @@ -37,7 +37,7 @@ Ext.define('PVE.node.Summary', { iconCls: 'fa fa-clipboard', handler: function(button) { window.getSelection().selectAllChildren( - document.getElementById('pkgversions') + document.getElementById('pkgversions'), ); document.execCommand("copy"); }, @@ -79,7 +79,7 @@ Ext.define('PVE.node.Summary', { }); view.update(Ext.htmlEncode(text)); - } + }, }); }, @@ -101,12 +101,12 @@ Ext.define('PVE.node.Summary', { text: gettext('Package versions'), handler: function(){ Proxmox.Utils.checked_command(function() { me.showVersions(); }); - } + }, }); var rrdstore = Ext.create('Proxmox.data.RRDStore', { rrdurl: "/api2/json/nodes/" + nodename + "/rrddata", - model: 'pve-rrd-node' + model: 'pve-rrd-node', }); Ext.apply(me, { @@ -120,42 +120,42 @@ Ext.define('PVE.node.Summary', { defaults: { minHeight: 320, padding: 5, - columnWidth: 1 + columnWidth: 1, }, items: [ { xtype: 'pveNodeStatus', rstore: rstore, width: 770, - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }, { xtype: 'proxmoxRRDChart', title: gettext('CPU usage'), - fields: ['cpu','iowait'], + fields: ['cpu', 'iowait'], fieldTitles: [gettext('CPU usage'), gettext('IO delay')], - store: rrdstore + store: rrdstore, }, { xtype: 'proxmoxRRDChart', title: gettext('Server load'), fields: ['loadavg'], fieldTitles: [gettext('Load average')], - store: rrdstore + store: rrdstore, }, { xtype: 'proxmoxRRDChart', title: gettext('Memory usage'), - fields: ['memtotal','memused'], + fields: ['memtotal', 'memused'], fieldTitles: [gettext('Total'), gettext('RAM usage')], - store: rrdstore + store: rrdstore, }, { xtype: 'proxmoxRRDChart', title: gettext('Network traffic'), - fields: ['netin','netout'], - store: rrdstore - } + fields: ['netin', 'netout'], + store: rrdstore, + }, ], listeners: { resize: function(panel) { @@ -174,7 +174,7 @@ Ext.define('PVE.node.Summary', { rstore.setInterval(5000); // don't stop it, it's not ours! rrdstore.stopUpdate(); }, - } + }, }); me.callParent(); @@ -186,5 +186,5 @@ Ext.define('PVE.node.Summary', { } PVE.Utils.updateColumns(me.getComponent('itemcontainer')); }); - } + }, }); diff --git a/www/manager6/node/ZFS.js b/www/manager6/node/ZFS.js index 0b63ccd7..8689817c 100644 --- a/www/manager6/node/ZFS.js +++ b/www/manager6/node/ZFS.js @@ -24,7 +24,7 @@ Ext.define('PVE.node.CreateZFS', { var disks = grid.getSelection(); var val = []; - disks.sort(function(a,b) { + disks.sort(function(a, b) { var aorder = a.get('order') || 0; var border = b.get('order') || 0; return (aorder - border); @@ -51,20 +51,20 @@ Ext.define('PVE.node.CreateZFS', { xtype: 'textfield', hidden: true, name: 'devices', - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxtextfield', name: 'name', fieldLabel: gettext('Name'), - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxcheckbox', name: 'add_storage', fieldLabel: gettext('Add Storage'), - value: '1' - } + value: '1', + }, ], column2: [ { @@ -78,8 +78,8 @@ Ext.define('PVE.node.CreateZFS', { ['raid10', 'RAID10'], ['raidz', 'RAIDZ'], ['raidz2', 'RAIDZ2'], - ['raidz3', 'RAIDZ3'] - ] + ['raidz3', 'RAIDZ3'], + ], }, { xtype: 'proxmoxKVComboBox', @@ -92,8 +92,8 @@ Ext.define('PVE.node.CreateZFS', { ['gzip', 'gzip'], ['lz4', 'lz4'], ['lzjb', 'lzjb'], - ['zle', 'zle'] - ] + ['zle', 'zle'], + ], }, { xtype: 'proxmoxintegerfield', @@ -101,8 +101,8 @@ Ext.define('PVE.node.CreateZFS', { minValue: 9, maxValue: 16, value: '12', - name: 'ashift' - } + name: 'ashift', + }, ], columnB: [ { @@ -112,13 +112,13 @@ Ext.define('PVE.node.CreateZFS', { itemId: 'disklist', selModel: 'checkboxmodel', listeners: { - selectionchange: update_disklist + selectionchange: update_disklist, }, store: { proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/disks/list?type=unused' - } + url: '/api2/json/nodes/' + me.nodename + '/disks/list?type=unused', + }, }, columns: [ { @@ -157,13 +157,13 @@ Ext.define('PVE.node.CreateZFS', { var record = numberfield.getWidgetRecord(); record.set('order', value); update_disklist(record); - } - } - } - } - ] - } - ] + }, + }, + }, + }, + ], + }, + ], }, { xtype: 'displayfield', @@ -172,13 +172,13 @@ Ext.define('PVE.node.CreateZFS', { value: 'Note: ZFS is not compatible with disks backed by a hardware ' + 'RAID controller. For details see ' + 'the reference documentation.', - } - ] + }, + ], }); me.callParent(); me.down('#disklist').getStore().load(); - } + }, }); Ext.define('PVE.node.ZFSDevices', { @@ -191,29 +191,29 @@ Ext.define('PVE.node.ZFSDevices', { xtype: 'treecolumn', text: gettext('Name'), dataIndex: 'name', - flex: 1 + flex: 1, }, { text: gettext('Health'), renderer: PVE.Utils.render_zfs_health, - dataIndex: 'state' + dataIndex: 'state', }, { text: 'READ', - dataIndex: 'read' + dataIndex: 'read', }, { text: 'WRITE', - dataIndex: 'write' + dataIndex: 'write', }, { text: 'CKSUM', - dataIndex: 'cksum' + dataIndex: 'cksum', }, { text: gettext('Message'), - dataIndex: 'msg' - } + dataIndex: 'msg', + }, ], rootVisible: true, @@ -232,7 +232,7 @@ Ext.define('PVE.node.ZFSDevices', { sm.deselectAll(); me.setRootNode(response.result.data); me.expandAll(); - } + }, }); }, @@ -260,16 +260,16 @@ Ext.define('PVE.node.ZFSDevices', { if (data.leaf) { return txt + 'hdd-o'; } - } - } + }, + }, ], - sorters: 'name' + sorters: 'name', }); me.callParent(); me.reload(); - } + }, }); Ext.define('PVE.node.ZFSStatus', { @@ -293,22 +293,22 @@ Ext.define('PVE.node.ZFSStatus', { me.rows = { scan: { - header: gettext('Scan') + header: gettext('Scan'), }, status: { - header: gettext('Status') + header: gettext('Status'), }, action: { - header: gettext('Action') + header: gettext('Action'), }, errors: { - header: gettext('Errors') - } + header: gettext('Errors'), + }, }; me.callParent(); me.reload(); - } + }, }); Ext.define('PVE.node.ZFSList', { @@ -321,34 +321,34 @@ Ext.define('PVE.node.ZFSList', { { text: gettext('Name'), dataIndex: 'name', - flex: 1 + flex: 1, }, { header: gettext('Size'), renderer: Proxmox.Utils.format_size, - dataIndex: 'size' + dataIndex: 'size', }, { header: gettext('Free'), renderer: Proxmox.Utils.format_size, - dataIndex: 'free' + dataIndex: 'free', }, { header: gettext('Allocated'), renderer: Proxmox.Utils.format_size, - dataIndex: 'alloc' + dataIndex: 'alloc', }, { header: gettext('Fragmentation'), renderer: function(value) { return value.toString() + '%'; }, - dataIndex: 'frag' + dataIndex: 'frag', }, { header: gettext('Health'), renderer: PVE.Utils.render_zfs_health, - dataIndex: 'health' + dataIndex: 'health', }, { header: gettext('Deduplication'), @@ -356,8 +356,8 @@ Ext.define('PVE.node.ZFSList', { renderer: function(value) { return value.toFixed(2).toString() + 'x'; }, - dataIndex: 'dedup' - } + dataIndex: 'dedup', + }, ], rootVisible: false, @@ -370,17 +370,17 @@ Ext.define('PVE.node.ZFSList', { handler: function() { var me = this.up('panel'); me.reload(); - } + }, }, { text: gettext('Create') + ': ZFS', handler: function() { var me = this.up('panel'); var win = Ext.create('PVE.node.CreateZFS', { - nodename: me.nodename + nodename: me.nodename, }).show(); win.on('destroy', function() { me.reload(); }); - } + }, }, { text: gettext('Detail'), @@ -393,8 +393,8 @@ Ext.define('PVE.node.ZFSList', { return; } me.show_detail(selection[0].get('name')); - } - } + }, + }, ], show_detail: function(zpool) { @@ -404,14 +404,14 @@ Ext.define('PVE.node.ZFSList', { layout: 'fit', nodename: me.nodename, flex: 0, - zpool: zpool + zpool: zpool, }); var devicetree = Ext.create('PVE.node.ZFSDevices', { title: gettext('Devices'), nodename: me.nodename, flex: 1, - zpool: zpool + zpool: zpool, }); @@ -427,7 +427,7 @@ Ext.define('PVE.node.ZFSList', { region: 'center', layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, items: [detailsgrid, devicetree], tbar: [{ @@ -437,9 +437,9 @@ Ext.define('PVE.node.ZFSList', { devicetree.reload(); detailsgrid.reload(); - } - }] - }] + }, + }], + }], }).show(); }, @@ -466,7 +466,7 @@ Ext.define('PVE.node.ZFSList', { itemdblclick: function(grid, record) { var me = this; me.show_detail(record.get('name')); - } + }, }, initComponent: function() { @@ -482,16 +482,16 @@ Ext.define('PVE.node.ZFSList', { fields: ['name', 'size', 'free', 'alloc', 'dedup', 'frag', 'health'], proxy: { type: 'proxmox', - url: "/api2/json/nodes/" + me.nodename + '/disks/zfs' + url: "/api2/json/nodes/" + me.nodename + '/disks/zfs', }, - sorters: 'name' - } + sorters: 'name', + }, }); me.callParent(); Proxmox.Utils.monStoreErrors(me, me.getStore(), true); me.reload(); - } + }, }); diff --git a/www/manager6/panel/ConfigPanel.js b/www/manager6/panel/ConfigPanel.js index fabf9108..e33360df 100644 --- a/www/manager6/panel/ConfigPanel.js +++ b/www/manager6/panel/ConfigPanel.js @@ -56,7 +56,7 @@ Ext.define('PVE.panel.Config', { style: { backgroundColor: '#f5f5f5', padding: 0, - margin: 0 + margin: 0, }, items: { xtype: 'treelist', @@ -94,16 +94,16 @@ Ext.define('PVE.panel.Config', { } else { info.toggle = true; } - } - } - } + }, + }, + }, }, { xtype: 'toolbar', itemId: 'toolbar', dock: 'top', height: 36, - overflowHandler: 'scroller' + overflowHandler: 'scroller', }], firstItem: '', @@ -191,13 +191,13 @@ Ext.define('PVE.panel.Config', { tbar.unshift({ xtype: 'tbtext', text: title, - baseCls: 'x-panel-header-text' + baseCls: 'x-panel-header-text', }); me.helpButton = Ext.create('Proxmox.button.Help', { hidden: false, listenToGlobalEvent: false, - onlineHelp: me.onlineHelp || undefined + onlineHelp: me.onlineHelp || undefined, }); tbar.push(me.helpButton); @@ -212,7 +212,7 @@ Ext.define('PVE.panel.Config', { title: gettext('Search'), iconCls: 'fa fa-search', xtype: 'pveResourceGrid', - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); } @@ -223,8 +223,8 @@ Ext.define('PVE.panel.Config', { me.store = Ext.create('Ext.data.TreeStore', { root: { - expanded: true - } + expanded: true, + }, }); var root = me.store.getRoot(); me.insertNodes(me.items); @@ -235,7 +235,7 @@ Ext.define('PVE.panel.Config', { pveSelNode: me.pveSelNode, viewFilter: me.viewFilter, workspace: me.workspace, - border: 0 + border: 0, }); me.callParent(); @@ -276,12 +276,12 @@ Ext.define('PVE.panel.Config', { var root = me.store.getRoot(); items.forEach(function(item) { - var treeitem = Ext.create('Ext.data.TreeModel',{ + var treeitem = Ext.create('Ext.data.TreeModel', { id: item.itemId, text: item.title, iconCls: item.iconCls, leaf: true, - expanded: item.expandedOnInit + expanded: item.expandedOnInit, }); item.header = false; if (me.savedItems[item.itemId] !== undefined) { diff --git a/www/manager6/panel/GuestStatusView.js b/www/manager6/panel/GuestStatusView.js index 2a9198cf..11969e55 100644 --- a/www/manager6/panel/GuestStatusView.js +++ b/www/manager6/panel/GuestStatusView.js @@ -9,23 +9,23 @@ Ext.define('PVE.panel.GuestStatusView', { var me = this; return { isQemu: me.pveSelNode.data.type === 'qemu', - isLxc: me.pveSelNode.data.type === 'lxc' + isLxc: me.pveSelNode.data.type === 'lxc', }; }, layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, defaults: { xtype: 'pveInfoWidget', - padding: '2 25' + padding: '2 25', }, items: [ { xtype: 'box', - height: 20 + height: 20, }, { itemId: 'status', @@ -41,7 +41,7 @@ Ext.define('PVE.panel.GuestStatusView', { text += ' (' + qmpstatus + ')'; } return text; - } + }, }, { itemId: 'hamanaged', @@ -49,7 +49,7 @@ Ext.define('PVE.panel.GuestStatusView', { title: gettext('HA State'), printBar: false, textField: 'ha', - renderer: PVE.Utils.format_ha + renderer: PVE.Utils.format_ha, }, { xtype: 'pveInfoWidget', @@ -57,13 +57,13 @@ Ext.define('PVE.panel.GuestStatusView', { iconCls: 'fa fa-building fa-fw', title: gettext('Node'), cbind: { - text: '{pveSelNode.data.node}' + text: '{pveSelNode.data.node}', }, - printBar: false + printBar: false, }, { xtype: 'box', - height: 15 + height: 15, }, { itemId: 'cpu', @@ -74,14 +74,14 @@ Ext.define('PVE.panel.GuestStatusView', { renderer: PVE.Utils.render_cpu_usage, // in this specific api call // we already have the correct value for the usage - calculate: Ext.identityFn + calculate: Ext.identityFn, }, { itemId: 'memory', iconCls: 'fa fa-fw pve-itype-icon-memory pve-icon', title: gettext('Memory usage'), valueField: 'mem', - maxField: 'maxmem' + maxField: 'maxmem', }, { itemId: 'swap', @@ -92,8 +92,8 @@ Ext.define('PVE.panel.GuestStatusView', { maxField: 'maxswap', cbind: { hidden: '{isQemu}', - disabled: '{isQemu}' - } + disabled: '{isQemu}', + }, }, { itemId: 'rootfs', @@ -108,13 +108,13 @@ Ext.define('PVE.panel.GuestStatusView', { if (used === 0) { return PVE.Utils.render_size(max); } else { - return PVE.Utils.render_size_usage(used,max); + return PVE.Utils.render_size_usage(used, max); } - } + }, }, { xtype: 'box', - height: 15 + height: 15, }, { itemId: 'ips', @@ -123,9 +123,9 @@ Ext.define('PVE.panel.GuestStatusView', { rstore: '{rstore}', pveSelNode: '{pveSelNode}', hidden: '{isLxc}', - disabled: '{isLxc}' - } - } + disabled: '{isLxc}', + }, + }, ], updateTitle: function() { @@ -139,5 +139,5 @@ Ext.define('PVE.panel.GuestStatusView', { } me.setTitle(me.getRecordValue('name') + text); - } + }, }); diff --git a/www/manager6/panel/GuestSummary.js b/www/manager6/panel/GuestSummary.js index 1c4022f4..8f822304 100644 --- a/www/manager6/panel/GuestSummary.js +++ b/www/manager6/panel/GuestSummary.js @@ -37,7 +37,7 @@ Ext.define('PVE.qemu.Summary', { padding: template ? '5' : '0 5 0 0', itemId: 'gueststatus', pveSelNode: me.pveSelNode, - rstore: rstore + rstore: rstore, }, { xtype: 'pveNotesView', @@ -59,13 +59,13 @@ Ext.define('PVE.qemu.Summary', { type: 'hbox', align: 'stretch', }, - items: items - } + items: items, + }, ]; rrdstore = Ext.create('Proxmox.data.RRDStore', { rrdurl: `/api2/json/nodes/${nodename}/${type}/${vmid}/rrddata`, - model: 'pve-rrd-guest' + model: 'pve-rrd-guest', }); items.push( @@ -75,7 +75,7 @@ Ext.define('PVE.qemu.Summary', { pveSelNode: me.pveSelNode, fields: ['cpu'], fieldTitles: [gettext('CPU usage')], - store: rrdstore + store: rrdstore, }, { xtype: 'proxmoxRRDChart', @@ -83,22 +83,22 @@ Ext.define('PVE.qemu.Summary', { pveSelNode: me.pveSelNode, fields: ['maxmem', 'mem'], fieldTitles: [gettext('Total'), gettext('RAM usage')], - store: rrdstore + store: rrdstore, }, { xtype: 'proxmoxRRDChart', title: gettext('Network traffic'), pveSelNode: me.pveSelNode, - fields: ['netin','netout'], - store: rrdstore + fields: ['netin', 'netout'], + store: rrdstore, }, { xtype: 'proxmoxRRDChart', title: gettext('Disk IO'), pveSelNode: me.pveSelNode, - fields: ['diskread','diskwrite'], - store: rrdstore - } + fields: ['diskread', 'diskwrite'], + store: rrdstore, + }, ); } @@ -110,7 +110,7 @@ Ext.define('PVE.qemu.Summary', { xtype: 'container', itemId: 'itemcontainer', layout: { - type: 'column' + type: 'column', }, minWidth: 700, defaults: { @@ -121,10 +121,10 @@ Ext.define('PVE.qemu.Summary', { listeners: { resize: function(container) { PVE.Utils.updateColumns(container); - } - } - } - ] + }, + }, + }, + ], }); me.callParent(); @@ -139,5 +139,5 @@ Ext.define('PVE.qemu.Summary', { } PVE.Utils.updateColumns(me.getComponent('itemcontainer')); }); - } + }, }); diff --git a/www/manager6/panel/HealthWidget.js b/www/manager6/panel/HealthWidget.js index 56990bf7..ccfa13e7 100644 --- a/www/manager6/panel/HealthWidget.js +++ b/www/manager6/panel/HealthWidget.js @@ -5,18 +5,18 @@ Ext.define('PVE.widget.HealthWidget', { data: { iconCls: PVE.Utils.get_health_icon(undefined, true), text: '', - title: '' + title: '', }, style: { - 'text-align':'center' + 'text-align':'center', }, tpl: [ '

{title}

', '', '

', - '{text}' + '{text}', ], updateHealth: function(data) { @@ -32,6 +32,6 @@ Ext.define('PVE.widget.HealthWidget', { } me.callParent(); - } + }, }); diff --git a/www/manager6/panel/IPSet.js b/www/manager6/panel/IPSet.js index 9645fa76..13091c32 100644 --- a/www/manager6/panel/IPSet.js +++ b/www/manager6/panel/IPSet.js @@ -1,7 +1,7 @@ Ext.define('pve-fw-ipsets', { extend: 'Ext.data.Model', fields: [ 'name', 'comment', 'digest' ], - idProperty: 'name' + idProperty: 'name', }); Ext.define('PVE.IPSetList', { @@ -35,12 +35,12 @@ Ext.define('PVE.IPSetList', { model: 'pve-fw-ipsets', proxy: { type: 'proxmox', - url: "/api2/json" + me.base_url + url: "/api2/json" + me.base_url, }, sorters: { property: 'name', - order: 'DESC' - } + order: 'DESC', + }, }); var sm = Ext.create('Ext.selection.RowModel', {}); @@ -71,22 +71,22 @@ Ext.define('PVE.IPSetList', { { xtype: 'hiddenfield', name: 'rename', - value: rec.data.name + value: rec.data.name, }, { xtype: 'textfield', name: 'name', value: rec.data.name, fieldLabel: gettext('Name'), - allowBlank: false + allowBlank: false, }, { xtype: 'textfield', name: 'comment', value: rec.data.comment, - fieldLabel: gettext('Comment') - } - ] + fieldLabel: gettext('Comment'), + }, + ], }); win.show(); win.on('destroy', reload); @@ -96,7 +96,7 @@ Ext.define('PVE.IPSetList', { text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); me.addBtn = new Proxmox.button.Button({ @@ -113,26 +113,26 @@ Ext.define('PVE.IPSetList', { name: 'name', value: '', fieldLabel: gettext('Name'), - allowBlank: false + allowBlank: false, }, { xtype: 'textfield', name: 'comment', value: '', - fieldLabel: gettext('Comment') - } - ] + fieldLabel: gettext('Comment'), + }, + ], }); win.show(); win.on('destroy', reload); - } + }, }); me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', { selModel: sm, baseurl: me.base_url + '/', - callback: reload + callback: reload, }); Ext.apply(me, { @@ -141,7 +141,7 @@ Ext.define('PVE.IPSetList', { selModel: sm, columns: [ { header: 'IPSet', dataIndex: 'name', width: '100' }, - { header: gettext('Comment'), dataIndex: 'comment', renderer: Ext.String.htmlEncode, flex: 1 } + { header: gettext('Comment'), dataIndex: 'comment', renderer: Ext.String.htmlEncode, flex: 1 }, ], listeners: { itemdblclick: run_editor, @@ -152,14 +152,14 @@ Ext.define('PVE.IPSetList', { deselect: function() { me.ipset_panel.setBaseUrl(undefined); }, - show: reload - } + show: reload, + }, }); me.callParent(); store.load(); - } + }, }); Ext.define('PVE.IPSetCidrEdit', { @@ -197,14 +197,14 @@ Ext.define('PVE.IPSetCidrEdit', { editable: true, base_url: me.list_refs_url, value: '', - fieldLabel: gettext('IP/CIDR') + fieldLabel: gettext('IP/CIDR'), }); } else { column1.push({ xtype: 'displayfield', name: 'cidr', value: '', - fieldLabel: gettext('IP/CIDR') + fieldLabel: gettext('IP/CIDR'), }); } @@ -217,22 +217,22 @@ Ext.define('PVE.IPSetCidrEdit', { name: 'nomatch', checked: false, uncheckedValue: 0, - fieldLabel: 'nomatch' - } + fieldLabel: 'nomatch', + }, ], columnB: [ { xtype: 'textfield', name: 'comment', value: '', - fieldLabel: gettext('Comment') - } - ] + fieldLabel: gettext('Comment'), + }, + ], }); Ext.apply(me, { subject: gettext('IP/CIDR'), - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -242,10 +242,10 @@ Ext.define('PVE.IPSetCidrEdit', { success: function(response, options) { var values = response.result.data; ipanel.setValues(values); - } + }, }); } - } + }, }); Ext.define('PVE.IPSetGrid', { @@ -275,7 +275,7 @@ Ext.define('PVE.IPSetGrid', { me.removeBtn.baseurl = url + '/'; me.store.setProxy({ type: 'proxmox', - url: '/api2/json' + url + url: '/api2/json' + url, }); me.store.load(); @@ -290,7 +290,7 @@ Ext.define('PVE.IPSetGrid', { } var store = new Ext.data.Store({ - model: 'pve-ipset' + model: 'pve-ipset', }); var reload = function() { @@ -306,7 +306,7 @@ Ext.define('PVE.IPSetGrid', { } var win = Ext.create('PVE.IPSetCidrEdit', { base_url: me.base_url, - cidr: rec.data.cidr + cidr: rec.data.cidr, }); win.show(); win.on('destroy', reload); @@ -316,7 +316,7 @@ Ext.define('PVE.IPSetGrid', { text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); me.addBtn = new Proxmox.button.Button({ @@ -328,17 +328,17 @@ Ext.define('PVE.IPSetGrid', { } var win = Ext.create('PVE.IPSetCidrEdit', { base_url: me.base_url, - list_refs_url: me.list_refs_url + list_refs_url: me.list_refs_url, }); win.show(); win.on('destroy', reload); - } + }, }); me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', { selModel: sm, baseurl: me.base_url + '/', - callback: reload + callback: reload, }); var render_errors = function(value, metaData, record) { @@ -349,7 +349,7 @@ Ext.define('PVE.IPSetGrid', { metaData.tdCls = 'proxmox-invalid-row'; var html = '

' + Ext.htmlEncode(msg) + '

'; metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + - html.replace(/\"/g,'"') + '"'; + html.replace(/\"/g, '"') + '"'; } } return value; @@ -360,11 +360,11 @@ Ext.define('PVE.IPSetGrid', { store: store, selModel: sm, listeners: { - itemdblclick: run_editor + itemdblclick: run_editor, }, columns: [ { - xtype: 'rownumberer' + xtype: 'rownumberer', }, { header: gettext('IP/CIDR'), @@ -376,7 +376,7 @@ Ext.define('PVE.IPSetGrid', { return '! ' + value; } return value; - } + }, }, { header: gettext('Comment'), @@ -384,9 +384,9 @@ Ext.define('PVE.IPSetGrid', { flex: 1, renderer: function(value) { return Ext.util.Format.htmlEncode(value); - } - } - ] + }, + }, + ], }); me.callParent(); @@ -394,14 +394,14 @@ Ext.define('PVE.IPSetGrid', { if (me.base_url) { me.setBaseUrl(me.base_url); // load } - } + }, }, function() { Ext.define('pve-ipset', { extend: 'Ext.data.Model', fields: [ { name: 'nomatch', type: 'boolean' }, 'cidr', 'comment', 'errors' ], - idProperty: 'cidr' + idProperty: 'cidr', }); }); @@ -426,7 +426,7 @@ Ext.define('PVE.IPSet', { var ipset_panel = Ext.createWidget('pveIPSetGrid', { region: 'center', list_refs_url: me.list_refs_url, - border: false + border: false, }); var ipset_list = Ext.createWidget('pveIPSetList', { @@ -435,7 +435,7 @@ Ext.define('PVE.IPSet', { base_url: me.base_url, width: '50%', border: false, - split: true + split: true, }); Ext.apply(me, { @@ -444,10 +444,10 @@ Ext.define('PVE.IPSet', { listeners: { show: function() { ipset_list.fireEvent('show', ipset_list); - } - } + }, + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/panel/InfoWidget.js b/www/manager6/panel/InfoWidget.js index 829ee112..ed1c1a0c 100644 --- a/www/manager6/panel/InfoWidget.js +++ b/www/manager6/panel/InfoWidget.js @@ -1,10 +1,10 @@ -Ext.define('PVE.widget.Info',{ +Ext.define('PVE.widget.Info', { extend: 'Ext.container.Container', alias: 'widget.pveInfoWidget', layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, value: 0, @@ -17,27 +17,27 @@ Ext.define('PVE.widget.Info',{ data: { title: '', usage: '', - iconCls: undefined + iconCls: undefined, }, tpl: [ '
', '', ' ', '', - '{title}
 
{usage}
' - ] + '{title} 
{usage}
', + ], }, { height: 2, - border: 0 + border: 0, }, { xtype: 'progressbar', itemId: 'progress', height: 5, value: 0, - animate: true - } + animate: true, + }, ], warningThreshold: 0.6, @@ -91,6 +91,6 @@ Ext.define('PVE.widget.Info',{ me.updateValue(me.text, me.value); me.setIconCls(me.iconCls); - } + }, }); diff --git a/www/manager6/panel/NotesView.js b/www/manager6/panel/NotesView.js index 90de7b5a..1cf75d39 100644 --- a/www/manager6/panel/NotesView.js +++ b/www/manager6/panel/NotesView.js @@ -17,16 +17,16 @@ Ext.define('PVE.panel.NotesView', { handler: function() { var me = this.up('panel'); me.run_editor(); - } - } - ] + }, + }, + ], }, run_editor: function() { var me = this; var win = Ext.create('PVE.window.NotesEdit', { pveSelNode: me.pveSelNode, - url: me.url + url: me.url, }); win.show(); win.on('destroy', me.load, me); @@ -49,7 +49,7 @@ Ext.define('PVE.panel.NotesView', { if (me.collapsible && me.collapseMode === 'auto') { me.setCollapsed(data === ''); } - } + }, }); }, @@ -72,7 +72,7 @@ Ext.define('PVE.panel.NotesView', { handler: function() { var me = this.up('panel'); me.run_editor(); - } + }, }], initComponent : function() { @@ -117,5 +117,5 @@ Ext.define('PVE.panel.NotesView', { } } me.load(); - } + }, }); diff --git a/www/manager6/panel/RunningChart.js b/www/manager6/panel/RunningChart.js index ecea867c..d6179810 100644 --- a/www/manager6/panel/RunningChart.js +++ b/www/manager6/panel/RunningChart.js @@ -8,7 +8,7 @@ Ext.define('PVE.widget.RunningChart', { layout: { type: 'hbox', - align: 'center' + align: 'center', }, items: [ { @@ -16,9 +16,9 @@ Ext.define('PVE.widget.RunningChart', { xtype: 'box', itemId: 'title', data: { - title: '' + title: '', }, - tpl: '

{title}:

' + tpl: '

{title}:

', }, { flex: 1, @@ -31,13 +31,13 @@ Ext.define('PVE.widget.RunningChart', { type: 'numeric', position: 'left', hidden: true, - minimum: 0 + minimum: 0, }, { type: 'numeric', position: 'bottom', - hidden: true - } + hidden: true, + }, ], store: { @@ -51,7 +51,7 @@ Ext.define('PVE.widget.RunningChart', { text: '0 B/s', textAlign: 'end', textBaseline: 'middle', - fontSize: 14 + fontSize: 14, }], series: [{ @@ -69,28 +69,28 @@ Ext.define('PVE.widget.RunningChart', { let value = me.up().renderer(record.data.val); tooltip.setHtml( me.up().title + ': ' + value + '
' + - Ext.Date.format(date, 'H:i:s') + Ext.Date.format(date, 'H:i:s'), ); - } + }, }, style: { lineWidth: 1.5, - opacity: 0.60 + opacity: 0.60, }, marker: { opacity: 0, scaling: 0.01, fx: { duration: 200, - easing: 'easeOut' - } + easing: 'easeOut', + }, }, highlightCfg: { opacity: 1, - scaling: 1.5 - } - }] - } + scaling: 1.5, + }, + }], + }, ], // the renderer for the tooltip and last value, default just the value @@ -107,7 +107,7 @@ Ext.define('PVE.widget.RunningChart', { me.store.add({ time: time || now, - val: value || 0 + val: value || 0, }); // delete all old records when we have 20 times more datapoints @@ -130,7 +130,7 @@ Ext.define('PVE.widget.RunningChart', { me.valuesprite.setText(panel.renderer(value || 0).toString()); me.valuesprite.setAttributes({ x: me.getWidth() - 15, - y: me.getHeight()/2 + y: me.getHeight()/2, }, true); me.redraw(); }, @@ -154,8 +154,8 @@ Ext.define('PVE.widget.RunningChart', { if (me.color) { me.chart.series[0].setStyle({ fill: me.color, - stroke: me.color + stroke: me.color, }); } - } + }, }); diff --git a/www/manager6/panel/StatusPanel.js b/www/manager6/panel/StatusPanel.js index 15c0cec5..33413285 100644 --- a/www/manager6/panel/StatusPanel.js +++ b/www/manager6/panel/StatusPanel.js @@ -26,20 +26,20 @@ Ext.define('PVE.panel.StatusPanel', { var atab = me.getActiveTab().itemId; var state = { value: atab }; sp.set(stateid, state); - } + }, }, items: [ { itemId: 'tasks', title: gettext('Tasks'), - xtype: 'pveClusterTasks' + xtype: 'pveClusterTasks', }, { itemId: 'clog', title: gettext('Cluster log'), - xtype: 'pveClusterLog' - } - ] + xtype: 'pveClusterLog', + }, + ], }); me.callParent(); @@ -61,5 +61,5 @@ Ext.define('PVE.panel.StatusPanel', { sp.un('statechange', statechange); }); - } + }, }); diff --git a/www/manager6/panel/StatusView.js b/www/manager6/panel/StatusView.js index ff27cdf3..057e30a1 100644 --- a/www/manager6/panel/StatusView.js +++ b/www/manager6/panel/StatusView.js @@ -3,7 +3,7 @@ Ext.define('PVE.panel.StatusView', { alias: 'widget.pveStatusView', layout: { - type: 'column' + type: 'column', }, title: gettext('Status'), @@ -26,7 +26,7 @@ Ext.define('PVE.panel.StatusView', { return ''; }, - fieldRenderer: function(val,max) { + fieldRenderer: function(val, max) { if (max === undefined) { return val; } @@ -34,7 +34,7 @@ Ext.define('PVE.panel.StatusView', { if (!Ext.isNumeric(max) || max === 1) { return PVE.Utils.render_usage(val); } - return PVE.Utils.render_size_usage(val,max); + return PVE.Utils.render_size_usage(val, max); }, fieldCalculator: function(used, max) { @@ -75,7 +75,7 @@ Ext.define('PVE.panel.StatusView', { if (Ext.isFunction(field.calculate)) { calculate = field.calculate; } - field.updateValue(renderer.call(field, used,max), calculate(used,max)); + field.updateValue(renderer.call(field, used, max), calculate(used, max)); } }, @@ -121,6 +121,6 @@ Ext.define('PVE.panel.StatusView', { me.callParent(); me.mon(me.rstore, 'load', 'updateValues'); - } + }, }); diff --git a/www/manager6/panel/TemplateStatusView.js b/www/manager6/panel/TemplateStatusView.js index 6f456099..7b60a8b8 100644 --- a/www/manager6/panel/TemplateStatusView.js +++ b/www/manager6/panel/TemplateStatusView.js @@ -1,21 +1,21 @@ -Ext.define('PVE.panel.TemplateStatusView',{ +Ext.define('PVE.panel.TemplateStatusView', { extend: 'PVE.panel.StatusView', alias: 'widget.pveTemplateStatusView', layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, defaults: { xtype: 'pveInfoWidget', printBar: false, - padding: '2 25' + padding: '2 25', }, items: [ { xtype: 'box', - height: 20 + height: 20, }, { itemId: 'hamanaged', @@ -23,48 +23,48 @@ Ext.define('PVE.panel.TemplateStatusView',{ title: gettext('HA State'), printBar: false, textField: 'ha', - renderer: PVE.Utils.format_ha + renderer: PVE.Utils.format_ha, }, { itemId: 'node', iconCls: 'fa fa-fw fa-building', - title: gettext('Node') + title: gettext('Node'), }, { xtype: 'box', - height: 20 + height: 20, }, { itemId: 'cpus', iconCls: 'fa fa-fw pve-itype-icon-processor pve-icon', title: gettext('Processors'), - textField: 'cpus' + textField: 'cpus', }, { itemId: 'memory', iconCls: 'fa fa-fw pve-itype-icon-memory pve-icon', title: gettext('Memory'), textField: 'maxmem', - renderer: PVE.Utils.render_size + renderer: PVE.Utils.render_size, }, { itemId: 'swap', iconCls: 'fa fa-refresh fa-fw', title: gettext('Swap'), textField: 'maxswap', - renderer: PVE.Utils.render_size + renderer: PVE.Utils.render_size, }, { itemId: 'disk', iconCls: 'fa fa-hdd-o fa-fw', title: gettext('Bootdisk size'), textField: 'maxdisk', - renderer: PVE.Utils.render_size + renderer: PVE.Utils.render_size, }, { xtype: 'box', - height: 20 - } + height: 20, + }, ], initComponent: function() { @@ -82,5 +82,5 @@ Ext.define('PVE.panel.TemplateStatusView',{ me.remove(me.getComponent('swap')); } me.getComponent('node').updateValue(me.pveSelNode.data.node); - } + }, }); diff --git a/www/manager6/pool/Config.js b/www/manager6/pool/Config.js index fedf25b2..1f04ba0e 100644 --- a/www/manager6/pool/Config.js +++ b/www/manager6/pool/Config.js @@ -20,25 +20,25 @@ Ext.define('PVE.pool.Config', { title: gettext('Summary'), iconCls: 'fa fa-book', xtype: 'pvePoolSummary', - itemId: 'summary' + itemId: 'summary', }, { title: gettext('Members'), xtype: 'pvePoolMembers', iconCls: 'fa fa-th', pool: pool, - itemId: 'members' + itemId: 'members', }, { xtype: 'pveACLView', title: gettext('Permissions'), iconCls: 'fa fa-unlock', itemId: 'permissions', - path: '/pool/' + pool - } - ] + path: '/pool/' + pool, + }, + ], }); me.callParent(); - } + }, }); diff --git a/www/manager6/pool/StatusView.js b/www/manager6/pool/StatusView.js index faaf8d88..19e75ace 100644 --- a/www/manager6/pool/StatusView.js +++ b/www/manager6/pool/StatusView.js @@ -19,15 +19,15 @@ Ext.define('PVE.pool.StatusView', { comment: { header: gettext('Comment'), renderer: Ext.String.htmlEncode, - required: true - } + required: true, + }, }; Ext.apply(me, { url: "/api2/json/pools/" + pool, - rows: rows + rows: rows, }); me.callParent(); - } + }, }); diff --git a/www/manager6/pool/Summary.js b/www/manager6/pool/Summary.js index 4a6fb843..b1f776f8 100644 --- a/www/manager6/pool/Summary.js +++ b/www/manager6/pool/Summary.js @@ -12,7 +12,7 @@ Ext.define('PVE.pool.Summary', { var statusview = Ext.create('PVE.pool.StatusView', { pveSelNode: me.pveSelNode, - style: 'padding-top:0px' + style: 'padding-top:0px', }); var rstore = statusview.rstore; @@ -22,14 +22,14 @@ Ext.define('PVE.pool.Summary', { bodyStyle: 'padding:10px', defaults: { style: 'padding-top:10px', - width: 800 + width: 800, }, - items: [ statusview ] + items: [ statusview ], }); me.on('activate', rstore.startUpdate); me.on('destroy', rstore.stopUpdate); me.callParent(); - } + }, }); diff --git a/www/manager6/qemu/AgentIPView.js b/www/manager6/qemu/AgentIPView.js index 32e8b08d..49052d93 100644 --- a/www/manager6/qemu/AgentIPView.js +++ b/www/manager6/qemu/AgentIPView.js @@ -4,7 +4,7 @@ Ext.define('PVE.window.IPInfo', { title: gettext('Guest Agent Network Information'), height: 300, layout: { - type: 'fit' + type: 'fit', }, modal: true, items: [ @@ -16,12 +16,12 @@ Ext.define('PVE.window.IPInfo', { { dataIndex: 'name', text: gettext('Name'), - flex: 3 + flex: 3, }, { dataIndex: 'hardware-address', text: gettext('MAC address'), - width: 140 + width: 140, }, { dataIndex: 'ip-addresses', @@ -41,11 +41,11 @@ Ext.define('PVE.window.IPInfo', { } }); return ips.join('
'); - } - } - ] - } - ] + }, + }, + ], + }, + ], }); Ext.define('PVE.qemu.AgentIPView', { @@ -54,7 +54,7 @@ Ext.define('PVE.qemu.AgentIPView', { layout: { type: 'hbox', - align: 'top' + align: 'top', }, nics: [], @@ -62,7 +62,7 @@ Ext.define('PVE.qemu.AgentIPView', { items: [ { xtype: 'box', - html: ' IPs' + html: ' IPs', }, { xtype: 'container', @@ -70,7 +70,7 @@ Ext.define('PVE.qemu.AgentIPView', { layout: { type: 'vbox', align: 'right', - pack: 'end' + pack: 'end', }, items: [ { @@ -78,8 +78,8 @@ Ext.define('PVE.qemu.AgentIPView', { flex: 1, itemId: 'ipBox', style: { - 'text-align': 'right' - } + 'text-align': 'right', + }, }, { xtype: 'button', @@ -93,10 +93,10 @@ Ext.define('PVE.qemu.AgentIPView', { win.down('grid').getStore().setData(me.nics); win.show(); }, - text: gettext('More') - } - ] - } + text: gettext('More'), + }, + ], + }, ], getDefaultIps: function(nics) { @@ -194,8 +194,8 @@ Ext.define('PVE.qemu.AgentIPView', { method: 'POST', proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + nodename + '/qemu/' + vmid + '/agent/network-get-interfaces' - } + url: '/api2/json/nodes/' + nodename + '/qemu/' + vmid + '/agent/network-get-interfaces', + }, }); me.callParent(); @@ -218,5 +218,5 @@ Ext.define('PVE.qemu.AgentIPView', { // check if the guest agent is there on every statusstore load me.mon(me.rstore, 'load', me.startIPStore, me); - } + }, }); diff --git a/www/manager6/qemu/AudioEdit.js b/www/manager6/qemu/AudioEdit.js index 2029bae1..617ef26b 100644 --- a/www/manager6/qemu/AudioEdit.js +++ b/www/manager6/qemu/AudioEdit.js @@ -9,11 +9,11 @@ Ext.define('PVE.qemu.AudioInputPanel', { var ret = PVE.Parser.printPropertyString(values); if (ret === '') { return { - 'delete': 'audio0' + 'delete': 'audio0', }; } return { - audio0: ret + audio0: ret, }; }, @@ -25,8 +25,8 @@ Ext.define('PVE.qemu.AudioInputPanel', { comboItems: [ ['ich9-intel-hda', 'ich9-intel-hda'], ['intel-hda', 'intel-hda'], - ['AC97', 'AC97'] - ] + ['AC97', 'AC97'], + ], }, { name: 'driver', xtype: 'proxmoxKVComboBox', @@ -35,8 +35,8 @@ Ext.define('PVE.qemu.AudioInputPanel', { comboItems: [ ['spice', 'SPICE'], ['none', `${Proxmox.Utils.NoneText} (${gettext('Dummy Device')})`], - ] - }] + ], + }], }); Ext.define('PVE.qemu.AudioEdit', { @@ -47,7 +47,7 @@ Ext.define('PVE.qemu.AudioEdit', { subject: gettext('Audio Device'), items: [{ - xtype: 'pveAudioInputPanel' + xtype: 'pveAudioInputPanel', }], initComponent : function() { @@ -63,7 +63,7 @@ Ext.define('PVE.qemu.AudioEdit', { if (audio0) { me.setValues(PVE.Parser.parsePropertyString(audio0)); } - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/CDEdit.js b/www/manager6/qemu/CDEdit.js index 00134c21..ea76b720 100644 --- a/www/manager6/qemu/CDEdit.js +++ b/www/manager6/qemu/CDEdit.js @@ -71,7 +71,7 @@ Ext.define('PVE.qemu.CDInputPanel', { if (!me.confid) { me.bussel = Ext.create('PVE.form.ControllerSelector', { - noVirtIO: true + noVirtIO: true, }); items.push(me.bussel); } @@ -95,8 +95,8 @@ Ext.define('PVE.qemu.CDInputPanel', { } else { cdImageField.reset(); } - } - } + }, + }, }); me.cdfilesel = Ext.create('PVE.form.FileSelector', { @@ -105,7 +105,7 @@ Ext.define('PVE.qemu.CDInputPanel', { storageContent: 'iso', fieldLabel: gettext('ISO image'), labelAlign: 'right', - allowBlank: false + allowBlank: false, }); me.cdstoragesel = Ext.create('PVE.form.StorageSelector', { @@ -119,8 +119,8 @@ Ext.define('PVE.qemu.CDInputPanel', { listeners: { change: function(f, value) { me.cdfilesel.setStorage(value); - } - } + }, + }, }); items.push(me.cdstoragesel); @@ -130,20 +130,20 @@ Ext.define('PVE.qemu.CDInputPanel', { xtype: 'radiofield', name: 'mediaType', inputValue: 'cdrom', - boxLabel: gettext('Use physical CD/DVD Drive') + boxLabel: gettext('Use physical CD/DVD Drive'), }); items.push({ xtype: 'radiofield', name: 'mediaType', inputValue: 'none', - boxLabel: gettext('Do not use any media') + boxLabel: gettext('Do not use any media'), }); me.items = items; me.callParent(); - } + }, }); Ext.define('PVE.qemu.CDEdit', { @@ -163,12 +163,12 @@ Ext.define('PVE.qemu.CDEdit', { var ipanel = Ext.create('PVE.qemu.CDInputPanel', { confid: me.confid, - nodename: nodename + nodename: nodename, }); Ext.applyIf(me, { subject: 'CD/DVD Drive', - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -186,7 +186,7 @@ Ext.define('PVE.qemu.CDEdit', { } ipanel.setDrive(drive); } - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/CIDriveEdit.js b/www/manager6/qemu/CIDriveEdit.js index 1148ce4e..c45735c6 100644 --- a/www/manager6/qemu/CIDriveEdit.js +++ b/www/manager6/qemu/CIDriveEdit.js @@ -39,18 +39,18 @@ Ext.define('PVE.qemu.CIDriveInputPanel', { noVirtIO: true, itemId: 'drive', fieldLabel: gettext('CloudInit Drive'), - name: 'drive' + name: 'drive', }, { xtype: 'pveDiskStorageSelector', itemId: 'storselector', storageContent: 'images', nodename: me.nodename, - hideSize: true - } + hideSize: true, + }, ]; me.callParent(); - } + }, }); Ext.define('PVE.qemu.CIDriveEdit', { @@ -71,7 +71,7 @@ Ext.define('PVE.qemu.CIDriveEdit', { me.items = [{ xtype: 'pveCIDriveInputPanel', itemId: 'cipanel', - nodename: nodename + nodename: nodename, }]; me.callParent(); @@ -79,7 +79,7 @@ Ext.define('PVE.qemu.CIDriveEdit', { me.load({ success: function(response, opts) { me.down('#cipanel').setVMConfig(response.result.data); - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/CloudInit.js b/www/manager6/qemu/CloudInit.js index a588f09b..c5ec5eda 100644 --- a/www/manager6/qemu/CloudInit.js +++ b/www/manager6/qemu/CloudInit.js @@ -57,10 +57,10 @@ Ext.define('PVE.qemu.CloudInit', { }, callback: function() { me.reload(); - } + }, }); }, - text: gettext('Remove') + text: gettext('Remove'), }, { xtype: 'proxmoxButton', @@ -73,7 +73,7 @@ Ext.define('PVE.qemu.CloudInit', { var me = this.up('grid'); me.run_editor(); }, - text: gettext('Edit') + text: gettext('Edit'), }, '-', { @@ -112,12 +112,12 @@ Ext.define('PVE.qemu.CloudInit', { failure: failure, callback: function() { me.reload(); - } + }, }); - } + }, }); - } - } + }, + }, ], border: false, @@ -171,7 +171,7 @@ Ext.define('PVE.qemu.CloudInit', { itemdblclick: function() { var me = this; me.run_editor(); - } + }, }, initComponent: function() { @@ -209,13 +209,13 @@ Ext.define('PVE.qemu.CloudInit', { deleteEmpty: true, emptyText: Proxmox.Utils.defaultText, fieldLabel: gettext('User'), - name: 'ciuser' - } - ] + name: 'ciuser', + }, + ], } : undefined, renderer: function(value) { return value || Proxmox.Utils.defaultText; - } + }, }, cipassword: { header: gettext('Password'), @@ -231,27 +231,27 @@ Ext.define('PVE.qemu.CloudInit', { deleteEmpty: true, emptyText: Proxmox.Utils.noneText, fieldLabel: gettext('Password'), - name: 'cipassword' - } - ] + name: 'cipassword', + }, + ], } : undefined, renderer: function(value) { return value || Proxmox.Utils.noneText; - } + }, }, searchdomain: { header: gettext('DNS domain'), iconCls: 'fa fa-globe', editor: caps.vms['VM.Config.Network'] ? 'PVE.lxc.DNSEdit' : undefined, never_delete: true, - defaultValue: gettext('use host settings') + defaultValue: gettext('use host settings'), }, nameserver: { header: gettext('DNS servers'), iconCls: 'fa fa-globe', editor: caps.vms['VM.Config.Network'] ? 'PVE.lxc.DNSEdit' : undefined, never_delete: true, - defaultValue: gettext('use host settings') + defaultValue: gettext('use host settings'), }, sshkeys: { header: gettext('SSH public key'), @@ -287,8 +287,8 @@ Ext.define('PVE.qemu.CloudInit', { return Proxmox.Utils.noneText; } }, - defaultValue: '' - } + defaultValue: '', + }, }; var i; var ipconfig_renderer = function(value, md, record, ri, ci, store, pending) { @@ -308,19 +308,19 @@ Ext.define('PVE.qemu.CloudInit', { header: gettext('IP Config') + ' (net' + i.toString() +')', editor: caps.vms['VM.Config.Network'] ? 'PVE.qemu.IPConfigEdit' : undefined, iconCls: 'fa fa-exchange', - renderer: ipconfig_renderer + renderer: ipconfig_renderer, }; me.rows['ipconfig' + i.toString()] = { - visible: false + visible: false, }; } PVE.Utils.forEachBus(['ide', 'scsi', 'sata'], function(type, id) { me.rows[type+id] = { - visible: false + visible: false, }; }); me.callParent(); me.mon(me.rstore, 'load', me.set_button_status, me); - } + }, }); diff --git a/www/manager6/qemu/CmdMenu.js b/www/manager6/qemu/CmdMenu.js index afa794a7..4740af8b 100644 --- a/www/manager6/qemu/CmdMenu.js +++ b/www/manager6/qemu/CmdMenu.js @@ -24,7 +24,7 @@ Ext.define('PVE.qemu.CmdMenu', { method: 'POST', failure: function(response, opts) { Ext.Msg.alert('Error', response.htmlStatus); - } + }, }); }; @@ -61,7 +61,7 @@ Ext.define('PVE.qemu.CmdMenu', { disabled: running || suspended, handler: function() { vm_command('start'); - } + }, }, { text: gettext('Pause'), @@ -76,7 +76,7 @@ Ext.define('PVE.qemu.CmdMenu', { } vm_command('suspend'); }); - } + }, }, { text: gettext('Hibernate'), @@ -92,7 +92,7 @@ Ext.define('PVE.qemu.CmdMenu', { } vm_command('suspend', { todisk: 1 }); }); - } + }, }, { text: gettext('Resume'), @@ -100,7 +100,7 @@ Ext.define('PVE.qemu.CmdMenu', { hidden: !suspended, handler: function() { vm_command('resume'); - } + }, }, { text: gettext('Shutdown'), @@ -115,7 +115,7 @@ Ext.define('PVE.qemu.CmdMenu', { vm_command('shutdown'); }); - } + }, }, { text: gettext('Stop'), @@ -131,7 +131,7 @@ Ext.define('PVE.qemu.CmdMenu', { vm_command("stop"); }); - } + }, }, { text: gettext('Reboot'), @@ -147,11 +147,11 @@ Ext.define('PVE.qemu.CmdMenu', { vm_command("reboot"); }); - } + }, }, { xtype: 'menuseparator', - hidden: (standalone || !caps.vms['VM.Migrate']) && !caps.vms['VM.Allocate'] && !caps.vms['VM.Clone'] + hidden: (standalone || !caps.vms['VM.Migrate']) && !caps.vms['VM.Allocate'] && !caps.vms['VM.Clone'], }, { text: gettext('Migrate'), @@ -161,10 +161,10 @@ Ext.define('PVE.qemu.CmdMenu', { var win = Ext.create('PVE.window.Migrate', { vmtype: 'qemu', nodename: nodename, - vmid: vmid + vmid: vmid, }); win.show(); - } + }, }, { text: gettext('Clone'), @@ -172,7 +172,7 @@ Ext.define('PVE.qemu.CmdMenu', { hidden: !caps.vms['VM.Clone'], handler: function() { PVE.window.Clone.wrap(nodename, vmid, me.isTemplate, 'qemu'); - } + }, }, { text: gettext('Convert to template'), @@ -190,10 +190,10 @@ Ext.define('PVE.qemu.CmdMenu', { method: 'POST', failure: function(response, opts) { Ext.Msg.alert('Error', response.htmlStatus); - } + }, }); }); - } + }, }, { xtype: 'menuseparator' }, { @@ -210,15 +210,15 @@ Ext.define('PVE.qemu.CmdMenu', { var allowXtermjs = response.result.data.serial; var consoles = { spice: allowSpice, - xtermjs: allowXtermjs + xtermjs: allowXtermjs, }; PVE.Utils.openDefaultConsoleWindow(consoles, 'kvm', vmid, nodename, vmname); - } + }, }); - } - } + }, + }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js index 346c71a7..f95ac7a2 100644 --- a/www/manager6/qemu/Config.js +++ b/www/manager6/qemu/Config.js @@ -28,7 +28,7 @@ Ext.define('PVE.qemu.Config', { me.statusStore = Ext.create('Proxmox.data.ObjectStore', { url: '/api2/json' + base_url + '/status/current', - interval: 1000 + interval: 1000, }); var vm_command = function(cmd, params) { @@ -39,7 +39,7 @@ Ext.define('PVE.qemu.Config', { method: 'POST', failure: function(response, opts) { Ext.Msg.alert('Error', response.htmlStatus); - } + }, }); }; @@ -50,7 +50,7 @@ Ext.define('PVE.qemu.Config', { handler: function() { vm_command('resume'); }, - iconCls: 'fa fa-play' + iconCls: 'fa fa-play', }); var startBtn = Ext.create('Ext.Button', { @@ -60,7 +60,7 @@ Ext.define('PVE.qemu.Config', { handler: function() { vm_command('start'); }, - iconCls: 'fa fa-play' + iconCls: 'fa fa-play', }); var migrateBtn = Ext.create('Ext.Button', { @@ -71,11 +71,11 @@ Ext.define('PVE.qemu.Config', { var win = Ext.create('PVE.window.Migrate', { vmtype: 'qemu', nodename: nodename, - vmid: vmid + vmid: vmid, }); win.show(); }, - iconCls: 'fa fa-send-o' + iconCls: 'fa fa-send-o', }); var moreBtn = Ext.create('Proxmox.button.Button', { @@ -87,7 +87,7 @@ Ext.define('PVE.qemu.Config', { hidden: caps.vms['VM.Clone'] ? false : true, handler: function() { PVE.window.Clone.wrap(nodename, vmid, template, 'qemu'); - } + }, }, { text: gettext('Convert to template'), @@ -103,9 +103,9 @@ Ext.define('PVE.qemu.Config', { method: 'POST', failure: function(response, opts) { Ext.Msg.alert('Error', response.htmlStatus); - } + }, }); - } + }, }, { iconCls: 'fa fa-heartbeat ', @@ -115,9 +115,9 @@ Ext.define('PVE.qemu.Config', { var ha = vm.hastate; Ext.create('PVE.ha.VMResourceEdit', { vmid: vmid, - isCreate: (!ha || ha === 'unmanaged') + isCreate: (!ha || ha === 'unmanaged'), }).show(); - } + }, }, { text: gettext('Remove'), @@ -126,12 +126,12 @@ Ext.define('PVE.qemu.Config', { handler: function() { Ext.create('PVE.window.SafeDestroy', { url: base_url, - item: { type: 'VM', id: vmid } + item: { type: 'VM', id: vmid }, }).show(); }, - iconCls: 'fa fa-trash-o' - } - ]} + iconCls: 'fa fa-trash-o', + }, + ]}, }); var shutdownBtn = Ext.create('PVE.button.Split', { @@ -151,16 +151,16 @@ Ext.define('PVE.qemu.Config', { handler: function() { vm_command("reboot"); }, - iconCls: 'fa fa-refresh' - },{ + iconCls: 'fa fa-refresh', + }, { text: gettext('Pause'), disabled: !caps.vms['VM.PowerMgmt'], confirmMsg: Proxmox.Utils.format_task_description('qmpause', vmid), handler: function() { vm_command("suspend"); }, - iconCls: 'fa fa-pause' - },{ + iconCls: 'fa fa-pause', + }, { text: gettext('Hibernate'), disabled: !caps.vms['VM.PowerMgmt'], confirmMsg: Proxmox.Utils.format_task_description('qmsuspend', vmid), @@ -168,8 +168,8 @@ Ext.define('PVE.qemu.Config', { handler: function() { vm_command("suspend", { todisk: 1 }); }, - iconCls: 'fa fa-download' - },{ + iconCls: 'fa fa-download', + }, { text: gettext('Stop'), disabled: !caps.vms['VM.PowerMgmt'], dangerous: true, @@ -178,8 +178,8 @@ Ext.define('PVE.qemu.Config', { handler: function() { vm_command("stop", { timeout: 30 }); }, - iconCls: 'fa fa-stop' - },{ + iconCls: 'fa fa-stop', + }, { text: gettext('Reset'), disabled: !caps.vms['VM.PowerMgmt'], tooltip: Ext.String.format(gettext('Reset {0} immediately'), 'VM'), @@ -187,10 +187,10 @@ Ext.define('PVE.qemu.Config', { handler: function() { vm_command("reset"); }, - iconCls: 'fa fa-bolt' - }] + iconCls: 'fa fa-bolt', + }], }, - iconCls: 'fa fa-power-off' + iconCls: 'fa fa-power-off', }); var consoleBtn = Ext.create('PVE.button.ConsoleButton', { @@ -199,18 +199,18 @@ Ext.define('PVE.qemu.Config', { consoleType: 'kvm', consoleName: vm.name, nodename: nodename, - vmid: vmid + vmid: vmid, }); var statusTxt = Ext.create('Ext.toolbar.TextItem', { data: { - lock: undefined + lock: undefined, }, tpl: [ '', ' ({lock})', - '' - ] + '', + ], }); Ext.apply(me, { @@ -224,9 +224,9 @@ Ext.define('PVE.qemu.Config', { title: gettext('Summary'), xtype: 'pveGuestSummary', iconCls: 'fa fa-book', - itemId: 'summary' - } - ] + itemId: 'summary', + }, + ], }); if (caps.vms['VM.Console'] && !template) { @@ -237,7 +237,7 @@ Ext.define('PVE.qemu.Config', { xtype: 'pveNoVncConsole', vmid: vmid, consoleType: 'kvm', - nodename: nodename + nodename: nodename, }); } @@ -246,19 +246,19 @@ Ext.define('PVE.qemu.Config', { title: gettext('Hardware'), itemId: 'hardware', iconCls: 'fa fa-desktop', - xtype: 'PVE.qemu.HardwareView' + xtype: 'PVE.qemu.HardwareView', }, { title: 'Cloud-Init', itemId: 'cloudinit', iconCls: 'fa fa-cloud', - xtype: 'pveCiPanel' + xtype: 'pveCiPanel', }, { title: gettext('Options'), iconCls: 'fa fa-gear', itemId: 'options', - xtype: 'PVE.qemu.Options' + xtype: 'PVE.qemu.Options', }, { title: gettext('Task History'), @@ -266,8 +266,8 @@ Ext.define('PVE.qemu.Config', { xtype: 'proxmoxNodeTasks', iconCls: 'fa fa-list', nodename: nodename, - vmidFilter: vmid - } + vmidFilter: vmid, + }, ); if (caps.vms['VM.Monitor'] && !template) { @@ -275,7 +275,7 @@ Ext.define('PVE.qemu.Config', { title: gettext('Monitor'), iconCls: 'fa fa-eye', itemId: 'monitor', - xtype: 'pveQemuMonitor' + xtype: 'pveQemuMonitor', }); } @@ -284,13 +284,13 @@ Ext.define('PVE.qemu.Config', { title: gettext('Backup'), iconCls: 'fa fa-floppy-o', xtype: 'pveBackupView', - itemId: 'backup' + itemId: 'backup', }, { title: gettext('Replication'), iconCls: 'fa fa-retweet', xtype: 'pveReplicaView', - itemId: 'replication' + itemId: 'replication', }); } @@ -301,7 +301,7 @@ Ext.define('PVE.qemu.Config', { iconCls: 'fa fa-history', type: 'qemu', xtype: 'pveGuestSnapshotTree', - itemId: 'snapshot' + itemId: 'snapshot', }); } @@ -314,7 +314,7 @@ Ext.define('PVE.qemu.Config', { allow_iface: true, base_url: base_url + '/firewall/rules', list_refs_url: base_url + '/firewall/refs', - itemId: 'firewall' + itemId: 'firewall', }, { xtype: 'pveFirewallOptions', @@ -324,7 +324,7 @@ Ext.define('PVE.qemu.Config', { title: gettext('Options'), base_url: base_url + '/firewall/options', fwtype: 'vm', - itemId: 'firewall-options' + itemId: 'firewall-options', }, { xtype: 'pveFirewallAliases', @@ -332,7 +332,7 @@ Ext.define('PVE.qemu.Config', { groups: ['firewall'], iconCls: 'fa fa-external-link', base_url: base_url + '/firewall/aliases', - itemId: 'firewall-aliases' + itemId: 'firewall-aliases', }, { xtype: 'pveIPSet', @@ -341,7 +341,7 @@ Ext.define('PVE.qemu.Config', { iconCls: 'fa fa-list-ol', base_url: base_url + '/firewall/ipset', list_refs_url: base_url + '/firewall/refs', - itemId: 'firewall-ipset' + itemId: 'firewall-ipset', }, { title: gettext('Log'), @@ -350,8 +350,8 @@ Ext.define('PVE.qemu.Config', { onlineHelp: 'chapter_pve_firewall', itemId: 'firewall-fwlog', xtype: 'proxmoxLogView', - url: '/api2/extjs' + base_url + '/firewall/log' - } + url: '/api2/extjs' + base_url + '/firewall/log', + }, ); } @@ -361,7 +361,7 @@ Ext.define('PVE.qemu.Config', { title: gettext('Permissions'), iconCls: 'fa fa-unlock', itemId: 'permissions', - path: '/vms/' + vmid + path: '/vms/' + vmid, }); } @@ -437,5 +437,5 @@ Ext.define('PVE.qemu.Config', { me.on('destroy', function() { me.statusStore.stopUpdate(); }); - } + }, }); diff --git a/www/manager6/qemu/CreateWizard.js b/www/manager6/qemu/CreateWizard.js index 81979978..f43f9573 100644 --- a/www/manager6/qemu/CreateWizard.js +++ b/www/manager6/qemu/CreateWizard.js @@ -7,13 +7,13 @@ Ext.define('PVE.qemu.CreateWizard', { data: { nodename: '', current: { - scsihw: '' - } - } + scsihw: '', + }, + }, }, cbindData: { - nodename: undefined + nodename: undefined, }, subject: gettext('Virtual Machine'), @@ -29,14 +29,14 @@ Ext.define('PVE.qemu.CreateWizard', { name: 'nodename', cbind: { selectCurNode: '{!nodename}', - preferredValue: '{nodename}' + preferredValue: '{nodename}', }, bind: { - value: '{nodename}' + value: '{nodename}', }, fieldLabel: gettext('Node'), allowBlank: false, - onlineValidator: true + onlineValidator: true, }, { xtype: 'pveGuestIDSelector', @@ -44,7 +44,7 @@ Ext.define('PVE.qemu.CreateWizard', { guestType: 'qemu', value: '', loadNextFreeID: true, - validateExists: false + validateExists: false, }, { xtype: 'textfield', @@ -52,8 +52,8 @@ Ext.define('PVE.qemu.CreateWizard', { vtype: 'DnsName', value: '', fieldLabel: gettext('Name'), - allowBlank: true - } + allowBlank: true, + }, ], column2: [ { @@ -61,8 +61,8 @@ Ext.define('PVE.qemu.CreateWizard', { fieldLabel: gettext('Resource Pool'), name: 'pool', value: '', - allowBlank: true - } + allowBlank: true, + }, ], advancedColumn1: [ { @@ -71,8 +71,8 @@ Ext.define('PVE.qemu.CreateWizard', { uncheckedValue: 0, defaultValue: 0, deleteDefaultValue: true, - fieldLabel: gettext('Start at boot') - } + fieldLabel: gettext('Start at boot'), + }, ], advancedColumn2: [ { @@ -81,7 +81,7 @@ Ext.define('PVE.qemu.CreateWizard', { defaultValue: '', emptyText: 'any', labelWidth: 120, - fieldLabel: gettext('Start/Shutdown order') + fieldLabel: gettext('Start/Shutdown order'), }, { xtype: 'textfield', @@ -89,7 +89,7 @@ Ext.define('PVE.qemu.CreateWizard', { defaultValue: '', emptyText: 'default', labelWidth: 120, - fieldLabel: gettext('Startup delay') + fieldLabel: gettext('Startup delay'), }, { xtype: 'textfield', @@ -97,8 +97,8 @@ Ext.define('PVE.qemu.CreateWizard', { defaultValue: '', emptyText: 'default', labelWidth: 120, - fieldLabel: gettext('Shutdown timeout') - } + fieldLabel: gettext('Shutdown timeout'), + }, ], onGetValues: function(values) { @@ -111,7 +111,7 @@ Ext.define('PVE.qemu.CreateWizard', { var res = PVE.Parser.printStartup({ order: values.order, up: values.up, - down: values.down + down: values.down, }); if (res) { @@ -123,63 +123,63 @@ Ext.define('PVE.qemu.CreateWizard', { delete values.down; return values; - } + }, }, { xtype: 'container', layout: 'hbox', defaults: { flex: 1, - padding: '0 10' + padding: '0 10', }, title: gettext('OS'), items: [ { xtype: 'pveQemuCDInputPanel', bind: { - nodename: '{nodename}' + nodename: '{nodename}', }, confid: 'ide2', - insideWizard: true + insideWizard: true, }, { xtype: 'pveQemuOSTypePanel', - insideWizard: true - } - ] + insideWizard: true, + }, + ], }, { xtype: 'pveQemuSystemPanel', title: gettext('System'), isCreate: true, - insideWizard: true + insideWizard: true, }, { xtype: 'pveQemuHDInputPanel', bind: { - nodename: '{nodename}' + nodename: '{nodename}', }, title: gettext('Hard Disk'), isCreate: true, - insideWizard: true + insideWizard: true, }, { xtype: 'pveQemuProcessorPanel', insideWizard: true, - title: gettext('CPU') + title: gettext('CPU'), }, { xtype: 'pveQemuMemoryPanel', insideWizard: true, - title: gettext('Memory') + title: gettext('Memory'), }, { xtype: 'pveQemuNetworkInputPanel', bind: { - nodename: '{nodename}' + nodename: '{nodename}', }, title: gettext('Network'), - insideWizard: true + insideWizard: true, }, { title: gettext('Confirm'), @@ -191,14 +191,14 @@ Ext.define('PVE.qemu.CreateWizard', { model: 'KeyValue', sorters: [{ property : 'key', - direction: 'ASC' - }] + direction: 'ASC', + }], }, columns: [ {header: 'Key', width: 150, dataIndex: 'key'}, - {header: 'Value', flex: 1, dataIndex: 'value'} - ] - } + {header: 'Value', flex: 1, dataIndex: 'value'}, + ], + }, ], dockedItems: [ { @@ -206,8 +206,8 @@ Ext.define('PVE.qemu.CreateWizard', { name: 'start', dock: 'bottom', margin: '5 0 0 0', - boxLabel: gettext('Start after created') - } + boxLabel: gettext('Start after created'), + }, ], listeners: { show: function(panel) { @@ -228,7 +228,7 @@ Ext.define('PVE.qemu.CreateWizard', { summarystore.resumeEvents(); summarystore.fireEvent('refresh'); - } + }, }, onSubmit: function() { var wizard = this.up('window'); @@ -248,11 +248,11 @@ Ext.define('PVE.qemu.CreateWizard', { }, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); - } - } - ] + }, + }, + ], }); diff --git a/www/manager6/qemu/DisplayEdit.js b/www/manager6/qemu/DisplayEdit.js index 8c54b7a7..6838abcc 100644 --- a/www/manager6/qemu/DisplayEdit.js +++ b/www/manager6/qemu/DisplayEdit.js @@ -7,11 +7,11 @@ Ext.define('PVE.qemu.DisplayInputPanel', { var ret = PVE.Parser.printPropertyString(values, 'type'); if (ret === '') { return { - 'delete': 'vga' + 'delete': 'vga', }; } return { - vga: ret + vga: ret, }; }, @@ -73,17 +73,17 @@ Ext.define('PVE.qemu.DisplayInputPanel', { var memoryfield = me.down('field[name=memory]'); memoryfield.setEmptyText(emptyText); memoryfield.setDisabled(disable); - } - } - },{ + }, + }, + }, { xtype: 'proxmoxintegerfield', emptyText: Proxmox.Utils.defaultText, fieldLabel: gettext('Memory') + ' (MiB)', minValue: 4, maxValue: 512, step: 4, - name: 'memory' - }] + name: 'memory', + }], }); Ext.define('PVE.qemu.DisplayEdit', { @@ -95,7 +95,7 @@ Ext.define('PVE.qemu.DisplayEdit', { width: 350, items: [{ - xtype: 'pveDisplayInputPanel' + xtype: 'pveDisplayInputPanel', }], initComponent : function() { @@ -108,7 +108,7 @@ Ext.define('PVE.qemu.DisplayEdit', { me.vmconfig = response.result.data; var vga = me.vmconfig.vga || '__default__'; me.setValues(PVE.Parser.parsePropertyString(vga, 'type')); - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/HDEdit.js b/www/manager6/qemu/HDEdit.js index e2a5b914..8092fd27 100644 --- a/www/manager6/qemu/HDEdit.js +++ b/www/manager6/qemu/HDEdit.js @@ -37,7 +37,7 @@ Ext.define('PVE.qemu.HDInputPanel', { control: { 'field[name=controller]': { change: 'onControllerChange', - afterrender: 'onControllerChange' + afterrender: 'onControllerChange', }, 'field[name=iothread]' : { change: function(f, value) { @@ -46,8 +46,8 @@ Ext.define('PVE.qemu.HDInputPanel', { } var vmScsiType = value ? 'virtio-scsi-single': 'virtio-scsi-pci'; this.lookupReference('scsiController').setValue(vmScsiType); - } - } + }, + }, }, init: function(view) { @@ -55,7 +55,7 @@ Ext.define('PVE.qemu.HDInputPanel', { if (view.isCreate) { vm.set('isIncludedInBackup', true); } - } + }, }, onGetValues: function(values) { @@ -170,7 +170,7 @@ Ext.define('PVE.qemu.HDInputPanel', { if (!me.confid || me.unused) { me.bussel = Ext.create('PVE.form.ControllerSelector', { - vmconfig: me.insideWizard ? {ide2: 'cdrom'} : {} + vmconfig: me.insideWizard ? {ide2: 'cdrom'} : {}, }); me.column1.push(me.bussel); @@ -178,11 +178,11 @@ Ext.define('PVE.qemu.HDInputPanel', { fieldLabel: gettext('SCSI Controller'), reference: 'scsiController', bind: me.insideWizard ? { - value: '{current.scsihw}' + value: '{current.scsihw}', } : undefined, renderer: PVE.Utils.render_scsihw, submitValue: false, - hidden: true + hidden: true, }); me.column1.push(me.scsiController); } @@ -193,10 +193,10 @@ Ext.define('PVE.qemu.HDInputPanel', { fieldLabel: gettext('Disk image'), matchFieldWidth: false, listConfig: { - width: 350 + width: 350, }, data: [], - allowBlank: false + allowBlank: false, }); me.column1.push(me.unusedDisks); } else if (me.isCreate) { @@ -205,7 +205,7 @@ Ext.define('PVE.qemu.HDInputPanel', { storageContent: 'images', name: 'disk', nodename: me.nodename, - autoSelect: me.insideWizard + autoSelect: me.insideWizard, }); } else { me.column1.push({ @@ -213,7 +213,7 @@ Ext.define('PVE.qemu.HDInputPanel', { disabled: true, submitValue: false, fieldLabel: gettext('Disk image'), - name: 'hdimage' + name: 'hdimage', }); } @@ -222,14 +222,14 @@ Ext.define('PVE.qemu.HDInputPanel', { xtype: 'CacheTypeSelector', name: 'cache', value: '__default__', - fieldLabel: gettext('Cache') + fieldLabel: gettext('Cache'), }, { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Discard'), reference: 'discard', - name: 'discard' - } + name: 'discard', + }, ); me.advancedColumn1.push( @@ -239,7 +239,7 @@ Ext.define('PVE.qemu.HDInputPanel', { fieldLabel: gettext('SSD emulation'), labelWidth: labelWidth, name: 'ssd', - reference: 'ssd' + reference: 'ssd', }, { xtype: 'proxmoxcheckbox', @@ -247,7 +247,7 @@ Ext.define('PVE.qemu.HDInputPanel', { fieldLabel: 'IO thread', labelWidth: labelWidth, reference: 'iothread', - name: 'iothread' + name: 'iothread', }, { xtype: 'numberfield', @@ -256,7 +256,7 @@ Ext.define('PVE.qemu.HDInputPanel', { step: 1, fieldLabel: gettext('Read limit') + ' (MB/s)', labelWidth: labelWidth, - emptyText: gettext('unlimited') + emptyText: gettext('unlimited'), }, { xtype: 'numberfield', @@ -265,7 +265,7 @@ Ext.define('PVE.qemu.HDInputPanel', { step: 1, fieldLabel: gettext('Write limit') + ' (MB/s)', labelWidth: labelWidth, - emptyText: gettext('unlimited') + emptyText: gettext('unlimited'), }, { xtype: 'proxmoxintegerfield', @@ -274,7 +274,7 @@ Ext.define('PVE.qemu.HDInputPanel', { step: 10, fieldLabel: gettext('Read limit') + ' (ops/s)', labelWidth: labelWidth, - emptyText: gettext('unlimited') + emptyText: gettext('unlimited'), }, { xtype: 'proxmoxintegerfield', @@ -283,8 +283,8 @@ Ext.define('PVE.qemu.HDInputPanel', { step: 10, fieldLabel: gettext('Write limit') + ' (ops/s)', labelWidth: labelWidth, - emptyText: gettext('unlimited') - } + emptyText: gettext('unlimited'), + }, ); me.advancedColumn2.push( @@ -305,7 +305,7 @@ Ext.define('PVE.qemu.HDInputPanel', { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Skip replication'), labelWidth: labelWidth, - name: 'noreplicate' + name: 'noreplicate', }, { xtype: 'numberfield', @@ -314,7 +314,7 @@ Ext.define('PVE.qemu.HDInputPanel', { step: 1, fieldLabel: gettext('Read max burst') + ' (MB)', labelWidth: labelWidth, - emptyText: gettext('default') + emptyText: gettext('default'), }, { xtype: 'numberfield', @@ -323,7 +323,7 @@ Ext.define('PVE.qemu.HDInputPanel', { step: 1, fieldLabel: gettext('Write max burst') + ' (MB)', labelWidth: labelWidth, - emptyText: gettext('default') + emptyText: gettext('default'), }, { xtype: 'proxmoxintegerfield', @@ -332,7 +332,7 @@ Ext.define('PVE.qemu.HDInputPanel', { step: 10, fieldLabel: gettext('Read max burst') + ' (ops)', labelWidth: labelWidth, - emptyText: gettext('default') + emptyText: gettext('default'), }, { xtype: 'proxmoxintegerfield', @@ -341,12 +341,12 @@ Ext.define('PVE.qemu.HDInputPanel', { step: 10, fieldLabel: gettext('Write max burst') + ' (ops)', labelWidth: labelWidth, - emptyText: gettext('default') - } + emptyText: gettext('default'), + }, ); me.callParent(); - } + }, }); Ext.define('PVE.qemu.HDEdit', { @@ -372,7 +372,7 @@ Ext.define('PVE.qemu.HDEdit', { confid: me.confid, nodename: nodename, unused: unused, - isCreate: me.isCreate + isCreate: me.isCreate, }); var subject; @@ -404,7 +404,7 @@ Ext.define('PVE.qemu.HDEdit', { ipanel.setDrive(drive); me.isValid(); // trigger validation } - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/HDEfi.js b/www/manager6/qemu/HDEfi.js index a2c0307f..74e300f4 100644 --- a/www/manager6/qemu/HDEfi.js +++ b/www/manager6/qemu/HDEfi.js @@ -43,7 +43,7 @@ Ext.define('PVE.qemu.EFIDiskInputPanel', { name: 'efidisk0', storageContent: 'images', nodename: me.nodename, - hideSize: true + hideSize: true, }, { xtype: 'label', @@ -54,7 +54,7 @@ Ext.define('PVE.qemu.EFIDiskInputPanel', { ]; me.callParent(); - } + }, }); Ext.define('PVE.qemu.EFIDiskEdit', { @@ -82,5 +82,5 @@ Ext.define('PVE.qemu.EFIDiskEdit', { }]; me.callParent(); - } + }, }); diff --git a/www/manager6/qemu/HDMove.js b/www/manager6/qemu/HDMove.js index df325f75..8716a451 100644 --- a/www/manager6/qemu/HDMove.js +++ b/www/manager6/qemu/HDMove.js @@ -33,11 +33,11 @@ Ext.define('PVE.window.HDMove', { success: function(response, options) { var upid = response.result.data; var win = Ext.create('Proxmox.window.TaskViewer', { - upid: upid + upid: upid, }); win.show(); win.on('destroy', function() { me.close(); }); - } + }, }); }, @@ -68,8 +68,8 @@ Ext.define('PVE.window.HDMove', { value: me.disk, fieldLabel: qemu ? gettext('Disk') : gettext('Mount Point'), vtype: 'StorageId', - allowBlank: false - } + allowBlank: false, + }, ]; items.push({ @@ -77,7 +77,7 @@ Ext.define('PVE.window.HDMove', { storageLabel: gettext('Target Storage'), nodename: me.nodename, storageContent: qemu ? 'images' : 'rootdir', - hideSize: true + hideSize: true, }); items.push({ @@ -85,7 +85,7 @@ Ext.define('PVE.window.HDMove', { fieldLabel: gettext('Delete source'), name: 'deleteDisk', uncheckedValue: 0, - checked: false + checked: false, }); me.formPanel = Ext.create('Ext.form.Panel', { @@ -93,9 +93,9 @@ Ext.define('PVE.window.HDMove', { border: false, fieldDefaults: { labelWidth: 100, - anchor: '100%' + anchor: '100%', }, - items: items + items: items, }); var form = me.formPanel.getForm(); @@ -111,7 +111,7 @@ Ext.define('PVE.window.HDMove', { me.move_disk(me.disk, values.hdstorage, values.diskformat, values.deleteDisk); } - } + }, }); Ext.apply(me, { @@ -120,7 +120,7 @@ Ext.define('PVE.window.HDMove', { border: false, layout: 'fit', buttons: [ submitBtn ], - items: [ me.formPanel ] + items: [ me.formPanel ], }); @@ -131,5 +131,5 @@ Ext.define('PVE.window.HDMove', { }); me.formPanel.isValid(); - } + }, }); diff --git a/www/manager6/qemu/HDResize.js b/www/manager6/qemu/HDResize.js index 5ca564d2..524af347 100644 --- a/www/manager6/qemu/HDResize.js +++ b/www/manager6/qemu/HDResize.js @@ -17,7 +17,7 @@ Ext.define('PVE.window.HDResize', { }, success: function(response, options) { me.close(); - } + }, }); }, @@ -39,8 +39,8 @@ Ext.define('PVE.window.HDResize', { value: me.disk, fieldLabel: gettext('Disk'), vtype: 'StorageId', - allowBlank: false - } + allowBlank: false, + }, ]; me.hdsizesel = Ext.createWidget('numberfield', { @@ -50,7 +50,7 @@ Ext.define('PVE.window.HDResize', { decimalPrecision: 3, value: '0', fieldLabel: gettext('Size Increment') + ' (GiB)', - allowBlank: false + allowBlank: false, }); items.push(me.hdsizesel); @@ -60,9 +60,9 @@ Ext.define('PVE.window.HDResize', { border: false, fieldDefaults: { labelWidth: 140, - anchor: '100%' + anchor: '100%', }, - items: items + items: items, }); var form = me.formPanel.getForm(); @@ -77,7 +77,7 @@ Ext.define('PVE.window.HDResize', { var values = form.getValues(); me.resize_disk(me.disk, values.size); } - } + }, }); Ext.apply(me, { @@ -87,7 +87,7 @@ Ext.define('PVE.window.HDResize', { border: false, layout: 'fit', buttons: [ submitBtn ], - items: [ me.formPanel ] + items: [ me.formPanel ], }); @@ -97,5 +97,5 @@ Ext.define('PVE.window.HDResize', { return; } - } + }, }); diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index b641317d..0bc913b4 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -88,7 +88,7 @@ Ext.define('PVE.qemu.HardwareView', { res += ' [balloon=0]'; } return res; - } + }, }, sockets: { header: gettext('Processors'), @@ -133,7 +133,7 @@ Ext.define('PVE.qemu.HardwareView', { } return res; - } + }, }, bios: { header: 'BIOS', @@ -142,7 +142,7 @@ Ext.define('PVE.qemu.HardwareView', { editor: caps.vms['VM.Config.Options'] ? 'PVE.qemu.BiosEdit' : undefined, defaultValue: '', iconCls: 'microchip', - renderer: PVE.Utils.render_qemu_bios + renderer: PVE.Utils.render_qemu_bios, }, vga: { header: gettext('Display'), @@ -151,7 +151,7 @@ Ext.define('PVE.qemu.HardwareView', { iconCls: 'desktop', group:5, defaultValue: '', - renderer: PVE.Utils.render_kvm_vga_driver + renderer: PVE.Utils.render_kvm_vga_driver, }, machine: { header: gettext('Machine'), @@ -166,14 +166,14 @@ Ext.define('PVE.qemu.HardwareView', { fieldLabel: gettext('Machine'), comboItems: [ ['__default__', PVE.Utils.render_qemu_machine('')], - ['q35', 'q35'] - ] + ['q35', 'q35'], + ], }]} : undefined, iconCls: 'cogs', never_delete: true, group: 6, defaultValue: '', - renderer: PVE.Utils.render_qemu_machine + renderer: PVE.Utils.render_qemu_machine, }, scsihw: { header: gettext('SCSI Controller'), @@ -182,7 +182,7 @@ Ext.define('PVE.qemu.HardwareView', { renderer: PVE.Utils.render_scsihw, group: 7, never_delete: true, - defaultValue: '' + defaultValue: '', }, vmstate: { header: gettext('Hibernation VM State'), @@ -191,32 +191,32 @@ Ext.define('PVE.qemu.HardwareView', { group: 100, }, cores: { - visible: false + visible: false, }, cpu: { - visible: false + visible: false, }, numa: { - visible: false + visible: false, }, balloon: { - visible: false + visible: false, }, hotplug: { - visible: false + visible: false, }, vcpus: { - visible: false + visible: false, }, cpuunits: { - visible: false + visible: false, }, cpulimit: { - visible: false + visible: false, }, shares: { - visible: false - } + visible: false, + }, }; PVE.Utils.forEachBus(undefined, function(type, id) { @@ -229,7 +229,7 @@ Ext.define('PVE.qemu.HardwareView', { isOnStorageBus: true, header: gettext('Hard Disk') + ' (' + confid +')', cdheader: gettext('CD/DVD Drive') + ' (' + confid +')', - cloudheader: gettext('CloudInit Drive') + ' (' + confid + ')' + cloudheader: gettext('CloudInit Drive') + ' (' + confid + ')', }; }); for (i = 0; i < PVE.Utils.hardware_counts.net; i++) { @@ -240,7 +240,7 @@ Ext.define('PVE.qemu.HardwareView', { iconCls: 'exchange', editor: caps.vms['VM.Config.Network'] ? 'PVE.qemu.NetworkEdit' : undefined, never_delete: caps.vms['VM.Config.Network'] ? false : true, - header: gettext('Network Device') + ' (' + confid +')' + header: gettext('Network Device') + ' (' + confid +')', }; } rows.efidisk0 = { @@ -248,7 +248,7 @@ Ext.define('PVE.qemu.HardwareView', { iconCls: 'hdd-o', editor: null, never_delete: caps.vms['VM.Config.Disk'] ? false : true, - header: gettext('EFI Disk') + header: gettext('EFI Disk'), }; for (i = 0; i < PVE.Utils.hardware_counts.usb; i++) { confid = "usb" + i.toString(); @@ -258,7 +258,7 @@ Ext.define('PVE.qemu.HardwareView', { iconCls: 'usb', editor: caps.nodes['Sys.Console'] ? 'PVE.qemu.USBEdit' : undefined, never_delete: caps.nodes['Sys.Console'] ? false : true, - header: gettext('USB Device') + ' (' + confid + ')' + header: gettext('USB Device') + ' (' + confid + ')', }; } for (i = 0; i < PVE.Utils.hardware_counts.hostpci; i++) { @@ -269,7 +269,7 @@ Ext.define('PVE.qemu.HardwareView', { tdCls: 'pve-itype-icon-pci', never_delete: caps.nodes['Sys.Console'] ? false : true, editor: caps.nodes['Sys.Console'] ? 'PVE.qemu.PCIEdit' : undefined, - header: gettext('PCI Device') + ' (' + confid + ')' + header: gettext('PCI Device') + ' (' + confid + ')', }; } for (i = 0; i < PVE.Utils.hardware_counts.serial; i++) { @@ -279,7 +279,7 @@ Ext.define('PVE.qemu.HardwareView', { order: i, tdCls: 'pve-itype-icon-serial', never_delete: caps.nodes['Sys.Console'] ? false : true, - header: gettext('Serial Port') + ' (' + confid + ')' + header: gettext('Serial Port') + ' (' + confid + ')', }; } rows.audio0 = { @@ -287,7 +287,7 @@ Ext.define('PVE.qemu.HardwareView', { iconCls: 'volume-up', editor: caps.vms['VM.Config.HWType'] ? 'PVE.qemu.AudioEdit' : undefined, never_delete: caps.vms['VM.Config.HWType'] ? false : true, - header: gettext('Audio Device') + header: gettext('Audio Device'), }; for (i = 0; i < 256; i++) { rows["unused" + i.toString()] = { @@ -296,7 +296,7 @@ Ext.define('PVE.qemu.HardwareView', { iconCls: 'hdd-o', del_extra_msg: gettext('This will permanently erase all data.'), editor: caps.vms['VM.Config.Disk'] ? 'PVE.qemu.HDEdit' : undefined, - header: gettext('Unused Disk') + ' ' + i.toString() + header: gettext('Unused Disk') + ' ' + i.toString(), }; } rows.rng0 = { @@ -304,7 +304,7 @@ Ext.define('PVE.qemu.HardwareView', { tdCls: 'pve-itype-icon-die', editor: caps.nodes['Sys.Console'] ? 'PVE.qemu.RNGEdit' : undefined, never_delete: caps.nodes['Sys.Console'] ? false : true, - header: gettext("VirtIO RNG") + header: gettext("VirtIO RNG"), }; var sorterFn = function(rec1, rec2) { @@ -365,13 +365,13 @@ Ext.define('PVE.qemu.HardwareView', { win = Ext.create(editor, { pveSelNode: me.pveSelNode, confid: rec.data.key, - url: '/api2/extjs/' + baseurl + url: '/api2/extjs/' + baseurl, }); } else { var config = Ext.apply({ pveSelNode: me.pveSelNode, confid: rec.data.key, - url: '/api2/extjs/' + baseurl + url: '/api2/extjs/' + baseurl, }, rowdef.editor); win = Ext.createWidget(rowdef.editor.xtype, config); win.load(); @@ -390,7 +390,7 @@ Ext.define('PVE.qemu.HardwareView', { var win = Ext.create('PVE.window.HDResize', { disk: rec.data.key, nodename: nodename, - vmid: vmid + vmid: vmid, }); win.show(); @@ -407,7 +407,7 @@ Ext.define('PVE.qemu.HardwareView', { var win = Ext.create('PVE.window.HDMove', { disk: rec.data.key, nodename: nodename, - vmid: vmid + vmid: vmid, }); win.show(); @@ -419,21 +419,21 @@ Ext.define('PVE.qemu.HardwareView', { text: gettext('Edit'), selModel: sm, disabled: true, - handler: run_editor + handler: run_editor, }); var resize_btn = new Proxmox.button.Button({ text: gettext('Resize disk'), selModel: sm, disabled: true, - handler: run_resize + handler: run_resize, }); var move_btn = new Proxmox.button.Button({ text: gettext('Move disk'), selModel: sm, disabled: true, - handler: run_move + handler: run_move, }); var remove_btn = new Proxmox.button.Button({ @@ -467,7 +467,7 @@ Ext.define('PVE.qemu.HardwareView', { waitMsgTarget: me, method: b.RESTMethod, params: { - 'delete': rec.data.key + 'delete': rec.data.key, }, callback: () => me.reload(), failure: function (response, opts) { @@ -480,11 +480,11 @@ Ext.define('PVE.qemu.HardwareView', { upid: upid, listeners: { destroy: () => me.reload(), - } + }, }); win.show(); } - } + }, }); }, listeners: { @@ -501,15 +501,15 @@ Ext.define('PVE.qemu.HardwareView', { var optimal = alt > def ? alt : def; btn.setSize({ width: optimal }); - } - } + }, + }, }); var revert_btn = new PVE.button.PendingRevert({ apiurl: '/api2/extjs/' + baseurl, }); - var efidisk_menuitem = Ext.create('Ext.menu.Item',{ + var efidisk_menuitem = Ext.create('Ext.menu.Item', { text: gettext('EFI Disk'), iconCls: 'fa fa-fw fa-hdd-o black', disabled: !caps.vms['VM.Config.Disk'], @@ -524,7 +524,7 @@ Ext.define('PVE.qemu.HardwareView', { }); win.on('destroy', me.reload, me); win.show(); - } + }, }); let counts = {}; @@ -625,11 +625,11 @@ Ext.define('PVE.qemu.HardwareView', { handler: function() { var win = Ext.create('PVE.qemu.HDEdit', { url: '/api2/extjs/' + baseurl, - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); win.on('destroy', me.reload, me); win.show(); - } + }, }, { text: gettext('CD/DVD Drive'), @@ -638,11 +638,11 @@ Ext.define('PVE.qemu.HardwareView', { handler: function() { var win = Ext.create('PVE.qemu.CDEdit', { url: '/api2/extjs/' + baseurl, - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); win.on('destroy', me.reload, me); win.show(); - } + }, }, { text: gettext('Network Device'), @@ -653,11 +653,11 @@ Ext.define('PVE.qemu.HardwareView', { var win = Ext.create('PVE.qemu.NetworkEdit', { url: '/api2/extjs/' + baseurl, pveSelNode: me.pveSelNode, - isCreate: true + isCreate: true, }); win.on('destroy', me.reload, me); win.show(); - } + }, }, efidisk_menuitem, { @@ -668,11 +668,11 @@ Ext.define('PVE.qemu.HardwareView', { handler: function() { var win = Ext.create('PVE.qemu.USBEdit', { url: '/api2/extjs/' + baseurl, - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); win.on('destroy', me.reload, me); win.show(); - } + }, }, { text: gettext('PCI Device'), @@ -682,11 +682,11 @@ Ext.define('PVE.qemu.HardwareView', { handler: function() { var win = Ext.create('PVE.qemu.PCIEdit', { url: '/api2/extjs/' + baseurl, - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); win.on('destroy', me.reload, me); win.show(); - } + }, }, { text: gettext('Serial Port'), @@ -695,11 +695,11 @@ Ext.define('PVE.qemu.HardwareView', { disabled: !caps.vms['VM.Config.Options'], handler: function() { var win = Ext.create('PVE.qemu.SerialEdit', { - url: '/api2/extjs/' + baseurl + url: '/api2/extjs/' + baseurl, }); win.on('destroy', me.reload, me); win.show(); - } + }, }, { text: gettext('CloudInit Drive'), @@ -709,11 +709,11 @@ Ext.define('PVE.qemu.HardwareView', { handler: function() { var win = Ext.create('PVE.qemu.CIDriveEdit', { url: '/api2/extjs/' + baseurl, - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); win.on('destroy', me.reload, me); win.show(); - } + }, }, { text: gettext('Audio Device'), @@ -724,11 +724,11 @@ Ext.define('PVE.qemu.HardwareView', { var win = Ext.create('PVE.qemu.AudioEdit', { url: '/api2/extjs/' + baseurl, isCreate: true, - isAdd: true + isAdd: true, }); win.on('destroy', me.reload, me); win.show(); - } + }, }, { text: gettext("VirtIO RNG"), @@ -739,27 +739,27 @@ Ext.define('PVE.qemu.HardwareView', { var win = Ext.create('PVE.qemu.RNGEdit', { url: '/api2/extjs/' + baseurl, isCreate: true, - isAdd: true + isAdd: true, }); win.on('destroy', me.reload, me); win.show(); - } - } - ] - }) + }, + }, + ], + }), }, remove_btn, edit_btn, resize_btn, move_btn, - revert_btn + revert_btn, ], rows: rows, sorterFn: sorterFn, listeners: { itemdblclick: run_editor, - selectionchange: set_button_status - } + selectionchange: set_button_status, + }, }); me.callParent(); @@ -768,5 +768,5 @@ Ext.define('PVE.qemu.HardwareView', { me.on('destroy', me.rstore.stopUpdate, me.rstore); me.mon(me.getStore(), 'datachanged', set_button_status, me); - } + }, }); diff --git a/www/manager6/qemu/IPConfigEdit.js b/www/manager6/qemu/IPConfigEdit.js index 934a86be..6aa02759 100644 --- a/www/manager6/qemu/IPConfigEdit.js +++ b/www/manager6/qemu/IPConfigEdit.js @@ -64,19 +64,19 @@ Ext.define('PVE.qemu.IPConfigPanel', { { xtype: 'displayfield', fieldLabel: gettext('Network Device'), - value: me.netid + value: me.netid, }, { layout: { type: 'hbox', - align: 'middle' + align: 'middle', }, border: false, margin: '0 0 5 0', items: [ { xtype: 'label', - text: gettext('IPv4') + ':' + text: gettext('IPv4') + ':', }, { xtype: 'radiofield', @@ -89,8 +89,8 @@ Ext.define('PVE.qemu.IPConfigPanel', { change: function(cb, value) { me.down('field[name=ip]').setDisabled(!value); me.down('field[name=gw]').setDisabled(!value); - } - } + }, + }, }, { xtype: 'radiofield', @@ -98,9 +98,9 @@ Ext.define('PVE.qemu.IPConfigPanel', { name: 'ipv4mode', inputValue: 'dhcp', checked: false, - margin: '0 0 0 10' - } - ] + margin: '0 0 0 10', + }, + ], }, { xtype: 'textfield', @@ -108,7 +108,7 @@ Ext.define('PVE.qemu.IPConfigPanel', { vtype: 'IPCIDRAddress', value: '', disabled: true, - fieldLabel: gettext('IPv4/CIDR') + fieldLabel: gettext('IPv4/CIDR'), }, { xtype: 'textfield', @@ -116,25 +116,25 @@ Ext.define('PVE.qemu.IPConfigPanel', { value: '', vtype: 'IPAddress', disabled: true, - fieldLabel: gettext('Gateway') + ' (' + gettext('IPv4') +')' - } + fieldLabel: gettext('Gateway') + ' (' + gettext('IPv4') +')', + }, ]; me.column2 = [ { - xtype: 'displayfield' + xtype: 'displayfield', }, { layout: { type: 'hbox', - align: 'middle' + align: 'middle', }, border: false, margin: '0 0 5 0', items: [ { xtype: 'label', - text: gettext('IPv6') + ':' + text: gettext('IPv6') + ':', }, { xtype: 'radiofield', @@ -147,8 +147,8 @@ Ext.define('PVE.qemu.IPConfigPanel', { change: function(cb, value) { me.down('field[name=ip6]').setDisabled(!value); me.down('field[name=gw6]').setDisabled(!value); - } - } + }, + }, }, { xtype: 'radiofield', @@ -156,9 +156,9 @@ Ext.define('PVE.qemu.IPConfigPanel', { name: 'ipv6mode', inputValue: 'dhcp', checked: false, - margin: '0 0 0 10' - } - ] + margin: '0 0 0 10', + }, + ], }, { xtype: 'textfield', @@ -166,7 +166,7 @@ Ext.define('PVE.qemu.IPConfigPanel', { value: '', vtype: 'IP6CIDRAddress', disabled: true, - fieldLabel: gettext('IPv6/CIDR') + fieldLabel: gettext('IPv6/CIDR'), }, { xtype: 'textfield', @@ -174,12 +174,12 @@ Ext.define('PVE.qemu.IPConfigPanel', { vtype: 'IP6Address', value: '', disabled: true, - fieldLabel: gettext('Gateway') + ' (' + gettext('IPv6') +')' - } + fieldLabel: gettext('Gateway') + ' (' + gettext('IPv6') +')', + }, ]; me.callParent(); - } + }, }); Ext.define('PVE.qemu.IPConfigEdit', { @@ -208,12 +208,12 @@ Ext.define('PVE.qemu.IPConfigEdit', { var ipanel = Ext.create('PVE.qemu.IPConfigPanel', { confid: me.confid, netid: me.netid, - nodename: nodename + nodename: nodename, }); Ext.applyIf(me, { subject: gettext('Network Config'), - items: ipanel + items: ipanel, }); me.callParent(); @@ -233,7 +233,7 @@ Ext.define('PVE.qemu.IPConfigEdit', { } ipanel.setIPConfig(me.confid, ipconfig); ipanel.setVMConfig(me.vmconfig); - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/KeyboardEdit.js b/www/manager6/qemu/KeyboardEdit.js index 1011f470..c0042d6d 100644 --- a/www/manager6/qemu/KeyboardEdit.js +++ b/www/manager6/qemu/KeyboardEdit.js @@ -10,12 +10,12 @@ Ext.define('PVE.qemu.KeyboardEdit', { xtype: 'VNCKeyboardSelector', name: 'keyboard', value: '__default__', - fieldLabel: gettext('Keyboard Layout') - } + fieldLabel: gettext('Keyboard Layout'), + }, }); me.callParent(); me.load(); - } + }, }); diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js index fbe995a3..8f647aa8 100644 --- a/www/manager6/qemu/MemoryEdit.js +++ b/www/manager6/qemu/MemoryEdit.js @@ -51,9 +51,9 @@ Ext.define('PVE.qemu.MemoryInputPanel', { bf.setValue(value); } bf.validate(); - } - } - } + }, + }, + }, ]; me.advancedItems= [ @@ -73,8 +73,8 @@ Ext.define('PVE.qemu.MemoryInputPanel', { var memory = me.down('field[name=memory]').getValue(); var shares = me.down('field[name=shares]'); shares.setDisabled(value === memory); - } - } + }, + }, }, { xtype: 'proxmoxintegerfield', @@ -88,7 +88,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', { labelWidth: labelWidth, allowBlank: true, emptyText: Proxmox.Utils.defaultText + ' (1000)', - submitEmptyText: false + submitEmptyText: false, }, { xtype: 'proxmoxcheckbox', @@ -103,9 +103,9 @@ Ext.define('PVE.qemu.MemoryInputPanel', { var memory = me.down('field[name=memory]'); bf.setDisabled(!value); shares.setDisabled(!value || (bf.getValue() === memory.getValue())); - } - } - } + }, + }, + }, ]; if (me.insideWizard) { @@ -115,7 +115,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', { me.advancedItems = undefined; } me.callParent(); - } + }, }); @@ -135,7 +135,7 @@ Ext.define('PVE.qemu.MemoryEdit', { } var ipanel = Ext.create('PVE.qemu.MemoryInputPanel', { - hotplug: memoryhotplug + hotplug: memoryhotplug, }); Ext.apply(me, { @@ -143,7 +143,7 @@ Ext.define('PVE.qemu.MemoryEdit', { items: [ ipanel ], // uncomment the following to use the async configiguration API // backgroundDelay: 5, - width: 400 + width: 400, }); me.callParent(); @@ -156,11 +156,11 @@ Ext.define('PVE.qemu.MemoryEdit', { ballooning: data.balloon === 0 ? '0' : '1', shares: data.shares, memory: data.memory || '512', - balloon: data.balloon > 0 ? data.balloon : (data.memory || '512') + balloon: data.balloon > 0 ? data.balloon : (data.memory || '512'), }; ipanel.setValues(values); - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/Monitor.js b/www/manager6/qemu/Monitor.js index 900aee58..0f415757 100644 --- a/www/manager6/qemu/Monitor.js +++ b/www/manager6/qemu/Monitor.js @@ -28,7 +28,7 @@ Ext.define('PVE.qemu.Monitor', { autoScroll: true, border: true, margins: '5 5 5 5', - bodyStyle: 'font-family: monospace;' + bodyStyle: 'font-family: monospace;', }); var scrollToEnd = function() { @@ -81,7 +81,7 @@ Ext.define('PVE.qemu.Monitor', { }, failure: function(response, opts) { Ext.Msg.alert('Error', response.htmlStatus); - } + }, }); }; @@ -134,18 +134,18 @@ Ext.define('PVE.qemu.Monitor', { default: break; } - } - } - } + }, + }, + }, ], listeners: { show: function() { var field = me.query('textfield[name="cmd"]')[0]; field.focus(false, true); - } - } + }, + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/qemu/NetworkEdit.js b/www/manager6/qemu/NetworkEdit.js index 49e49dc9..d468b1ae 100644 --- a/www/manager6/qemu/NetworkEdit.js +++ b/www/manager6/qemu/NetworkEdit.js @@ -69,7 +69,7 @@ Ext.define('PVE.qemu.NetworkInputPanel', { fieldLabel: gettext('Bridge'), nodename: me.nodename, autoSelect: true, - allowBlank: false + allowBlank: false, }); me.column1 = [ @@ -77,22 +77,22 @@ Ext.define('PVE.qemu.NetworkInputPanel', { { xtype: 'pveVlanField', name: 'tag', - value: '' + value: '', }, { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Firewall'), name: 'firewall', - checked: (me.insideWizard || me.isCreate) - } + checked: (me.insideWizard || me.isCreate), + }, ]; me.advancedColumn1 = [ { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Disconnect'), - name: 'disconnect' - } + name: 'disconnect', + }, ]; if (me.insideWizard) { @@ -111,17 +111,17 @@ Ext.define('PVE.qemu.NetworkInputPanel', { 'model', 'macaddr', 'rate', - 'queues' + 'queues', ]; fields.forEach(function(fieldname) { me.down('field[name='+fieldname+']').setDisabled(value); }); me.down('field[name=bridge]').validate(); - } - } + }, + }, }); me.column2.unshift({ - xtype: 'displayfield' + xtype: 'displayfield', }); } @@ -131,7 +131,7 @@ Ext.define('PVE.qemu.NetworkInputPanel', { name: 'model', fieldLabel: gettext('Model'), value: PVE.qemu.OSDefaults.generic.networkCard, - allowBlank: false + allowBlank: false, }, { xtype: 'textfield', @@ -139,7 +139,7 @@ Ext.define('PVE.qemu.NetworkInputPanel', { fieldLabel: gettext('MAC address'), vtype: 'MacAddress', allowBlank: true, - emptyText: 'auto' + emptyText: 'auto', }); me.advancedColumn2 = [ { @@ -150,7 +150,7 @@ Ext.define('PVE.qemu.NetworkInputPanel', { maxValue: 10*1024, value: '', emptyText: 'unlimited', - allowBlank: true + allowBlank: true, }, { xtype: 'proxmoxintegerfield', @@ -159,12 +159,12 @@ Ext.define('PVE.qemu.NetworkInputPanel', { minValue: 1, maxValue: 8, value: '', - allowBlank: true - } + allowBlank: true, + }, ]; me.callParent(); - } + }, }); Ext.define('PVE.qemu.NetworkEdit', { @@ -186,12 +186,12 @@ Ext.define('PVE.qemu.NetworkEdit', { var ipanel = Ext.create('PVE.qemu.NetworkInputPanel', { confid: me.confid, nodename: nodename, - isCreate: me.isCreate + isCreate: me.isCreate, }); Ext.applyIf(me, { subject: gettext('Network Device'), - items: ipanel + items: ipanel, }); me.callParent(); @@ -226,7 +226,7 @@ Ext.define('PVE.qemu.NetworkEdit', { ipanel.setNetwork(me.confid, data); } - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/OSDefaults.js b/www/manager6/qemu/OSDefaults.js index d6f733a8..5ea28b29 100644 --- a/www/manager6/qemu/OSDefaults.js +++ b/www/manager6/qemu/OSDefaults.js @@ -41,9 +41,9 @@ Ext.define('PVE.qemu.OSDefaults', { ide: 4, sata: 3, scsi: 2, - virtio: 1 + virtio: 1, }, - scsihw: 'virtio-scsi-pci' + scsihw: 'virtio-scsi-pci', }; // virtio-net is in kernel since 2.6.25 @@ -56,9 +56,9 @@ Ext.define('PVE.qemu.OSDefaults', { scsi: 4, virtio: 3, sata: 2, - ide: 1 + ide: 1, }, - networkCard: 'virtio' + networkCard: 'virtio', }); // recommandation from http://wiki.qemu.org/Windows2000 @@ -66,12 +66,12 @@ Ext.define('PVE.qemu.OSDefaults', { pveOS: 'w2k', parent : 'generic', networkCard: 'rtl8139', - scsihw: '' + scsihw: '', }); // https://pve.proxmox.com/wiki/Windows_XP_Guest_Notes addOS({ pveOS: 'wxp', - parent : 'w2k' + parent : 'w2k', }); me.getDefaults = function(ostype) { @@ -81,5 +81,5 @@ Ext.define('PVE.qemu.OSDefaults', { return PVE.qemu.OSDefaults.generic; } }; - } + }, }); diff --git a/www/manager6/qemu/OSTypeEdit.js b/www/manager6/qemu/OSTypeEdit.js index b235c1e0..bc70fc4f 100644 --- a/www/manager6/qemu/OSTypeEdit.js +++ b/www/manager6/qemu/OSTypeEdit.js @@ -8,12 +8,12 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { xclass: 'Ext.app.ViewController', control: { 'combobox[name=osbase]': { - change: 'onOSBaseChange' + change: 'onOSBaseChange', }, 'combobox[name=ostype]': { afterrender: 'onOSTypeChange', - change: 'onOSTypeChange' - } + change: 'onOSTypeChange', + }, }, onOSBaseChange: function(field, value) { this.lookup('ostype').getStore().setData(PVE.Utils.kvm_ostypes[value]); @@ -39,7 +39,7 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { } else { throw 'non unique widget :' + widget + ' in Wizard'; } - } + }, }, initComponent : function() { @@ -49,7 +49,7 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { { xtype: 'displayfield', value: gettext('Guest OS') + ':', - hidden: !me.insideWizard + hidden: !me.insideWizard, }, { xtype: 'combobox', @@ -59,7 +59,7 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { editable: false, queryMode: 'local', value: 'Linux', - store: Object.keys(PVE.Utils.kvm_ostypes) + store: Object.keys(PVE.Utils.kvm_ostypes), }, { xtype: 'combobox', @@ -84,14 +84,14 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { } else { ostype.setValue(store.getAt(0)); } - } - } - } - } + }, + }, + }, + }, ]; me.callParent(); - } + }, }); Ext.define('PVE.qemu.OSTypeEdit', { @@ -111,7 +111,7 @@ Ext.define('PVE.qemu.OSTypeEdit', { var value = response.result.data.ostype || 'other'; var osinfo = PVE.Utils.get_kvm_osinfo(value); me.setValues({ ostype: value, osbase: osinfo.base }); - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/Options.js b/www/manager6/qemu/Options.js index 1f07d81a..a6b54efb 100644 --- a/www/manager6/qemu/Options.js +++ b/www/manager6/qemu/Options.js @@ -36,7 +36,7 @@ Ext.define('PVE.qemu.Options', { vtype: 'DnsName', value: '', fieldLabel: gettext('Name'), - allowBlank: true + allowBlank: true, }, onGetValues: function(values) { var params = values; @@ -46,9 +46,9 @@ Ext.define('PVE.qemu.Options', { params = { 'delete':'name'}; } return params; - } - } - } : undefined + }, + }, + } : undefined, }, onboot: { header: gettext('Start at boot'), @@ -63,9 +63,9 @@ Ext.define('PVE.qemu.Options', { uncheckedValue: 0, defaultValue: 0, deleteDefaultValue: true, - fieldLabel: gettext('Start at boot') - } - } : undefined + fieldLabel: gettext('Start at boot'), + }, + } : undefined, }, startup: { header: gettext('Start/Shutdown order'), @@ -74,17 +74,17 @@ Ext.define('PVE.qemu.Options', { editor: caps.vms['VM.Config.Options'] && caps.nodes['Sys.Modify'] ? { xtype: 'pveWindowStartupEdit', - onlineHelp: 'qm_startup_and_shutdown' - } : undefined + onlineHelp: 'qm_startup_and_shutdown', + } : undefined, }, ostype: { header: gettext('OS Type'), editor: caps.vms['VM.Config.Options'] ? 'PVE.qemu.OSTypeEdit' : undefined, renderer: PVE.Utils.render_kvm_ostype, - defaultValue: 'other' + defaultValue: 'other', }, bootdisk: { - visible: false + visible: false, }, boot: { header: gettext('Boot Order'), @@ -136,7 +136,7 @@ Ext.define('PVE.qemu.Options', { } } return text; - } + }, }, tablet: { header: gettext('Use tablet for pointer'), @@ -152,9 +152,9 @@ Ext.define('PVE.qemu.Options', { uncheckedValue: 0, defaultValue: 1, deleteDefaultValue: true, - fieldLabel: gettext('Enabled') - } - } : undefined + fieldLabel: gettext('Enabled'), + }, + } : undefined, }, hotplug: { header: gettext('Hotplug'), @@ -169,9 +169,9 @@ Ext.define('PVE.qemu.Options', { value: '', multiSelect: true, fieldLabel: gettext('Hotplug'), - allowBlank: true - } - } : undefined + allowBlank: true, + }, + } : undefined, }, acpi: { header: gettext('ACPI support'), @@ -187,9 +187,9 @@ Ext.define('PVE.qemu.Options', { uncheckedValue: 0, defaultValue: 1, deleteDefaultValue: true, - fieldLabel: gettext('Enabled') - } - } : undefined + fieldLabel: gettext('Enabled'), + }, + } : undefined, }, kvm: { header: gettext('KVM hardware virtualization'), @@ -205,9 +205,9 @@ Ext.define('PVE.qemu.Options', { uncheckedValue: 0, defaultValue: 1, deleteDefaultValue: true, - fieldLabel: gettext('Enabled') - } - } : undefined + fieldLabel: gettext('Enabled'), + }, + } : undefined, }, freeze: { header: gettext('Freeze CPU at startup'), @@ -223,9 +223,9 @@ Ext.define('PVE.qemu.Options', { defaultValue: 0, deleteDefaultValue: true, labelWidth: 140, - fieldLabel: gettext('Freeze CPU at startup') - } - } : undefined + fieldLabel: gettext('Freeze CPU at startup'), + }, + } : undefined, }, localtime: { header: gettext('Use local time for RTC'), @@ -245,9 +245,9 @@ Ext.define('PVE.qemu.Options', { [0, PVE.Utils.render_localtime(0)], ], labelWidth: 140, - fieldLabel: gettext('Use local time for RTC') - } - } : undefined + fieldLabel: gettext('Use local time for RTC'), + }, + } : undefined, }, startdate: { header: gettext('RTC start date'), @@ -262,15 +262,15 @@ Ext.define('PVE.qemu.Options', { value: 'now', fieldLabel: gettext('RTC start date'), vtype: 'QemuStartDate', - allowBlank: true - } - } : undefined + allowBlank: true, + }, + } : undefined, }, smbios1: { header: gettext('SMBIOS settings (type1)'), defaultValue: '', renderer: Ext.String.htmlEncode, - editor: caps.vms['VM.Config.HWType'] ? 'PVE.qemu.Smbios1Edit' : undefined + editor: caps.vms['VM.Config.HWType'] ? 'PVE.qemu.Smbios1Edit' : undefined, }, agent: { header: 'QEMU Guest Agent', @@ -282,9 +282,9 @@ Ext.define('PVE.qemu.Options', { width: 350, items: { xtype: 'pveAgentFeatureSelector', - name: 'agent' - } - } : undefined + name: 'agent', + }, + } : undefined, }, protection: { header: gettext('Protection'), @@ -299,9 +299,9 @@ Ext.define('PVE.qemu.Options', { uncheckedValue: 0, defaultValue: 0, deleteDefaultValue: true, - fieldLabel: gettext('Enabled') - } - } : undefined + fieldLabel: gettext('Enabled'), + }, + } : undefined, }, spice_enhancements: { header: gettext('Spice Enhancements'), @@ -314,8 +314,8 @@ Ext.define('PVE.qemu.Options', { items: { xtype: 'pveSpiceEnhancementSelector', name: 'spice_enhancements', - } - } : undefined + }, + } : undefined, }, vmstatestorage: { header: gettext('VM State storage'), @@ -336,12 +336,12 @@ Ext.define('PVE.qemu.Options', { skipEmptyText: true, nodename: nodename, name: 'vmstatestorage', - } - } : undefined + }, + } : undefined, }, hookscript: { - header: gettext('Hookscript') - } + header: gettext('Hookscript'), + }, }; var baseurl = 'nodes/' + nodename + '/qemu/' + vmid + '/config'; @@ -349,7 +349,7 @@ Ext.define('PVE.qemu.Options', { var edit_btn = new Ext.Button({ text: gettext('Edit'), disabled: true, - handler: function() { me.run_editor(); } + handler: function() { me.run_editor(); }, }); var revert_btn = new PVE.button.PendingRevert(); @@ -378,12 +378,12 @@ Ext.define('PVE.qemu.Options', { tbar: [ edit_btn, revert_btn ], rows: rows, editorConfig: { - url: "/api2/extjs/" + baseurl + url: "/api2/extjs/" + baseurl, }, listeners: { itemdblclick: me.run_editor, - selectionchange: set_button_status - } + selectionchange: set_button_status, + }, }); me.callParent(); @@ -395,6 +395,6 @@ Ext.define('PVE.qemu.Options', { me.mon(me.getStore(), 'datachanged', function() { set_button_status(); }); - } + }, }); diff --git a/www/manager6/qemu/PCIEdit.js b/www/manager6/qemu/PCIEdit.js index 72a355d0..3331f761 100644 --- a/www/manager6/qemu/PCIEdit.js +++ b/www/manager6/qemu/PCIEdit.js @@ -50,7 +50,7 @@ Ext.define('PVE.qemu.PCIInputPanel', { } } // remove optional '0000' domain - if (values.host.substring(0,5) === '0000:') { + if (values.host.substring(0, 5) === '0000:') { values.host = values.host.substring(5); } if (values.multifunction) { @@ -100,7 +100,7 @@ Ext.define('PVE.qemu.PCIInputPanel', { padding: '0 0 10 0', value: 'No IOMMU detected, please activate it.' + 'See Documentation for further information.', - userCls: 'pmx-hint' + userCls: 'pmx-hint', }); me.items.insert(0, warning); me.updateLayout(); // insert does not trigger that @@ -117,7 +117,7 @@ Ext.define('PVE.qemu.PCIInputPanel', { if (!pcidev) { return; } - var id = pcidev.data.id.substring(0,5); // 00:00 + var id = pcidev.data.id.substring(0, 5); // 00:00 var iommu = pcidev.data.iommugroup; // try to find out if there are more devices // in that iommu group @@ -125,7 +125,7 @@ Ext.define('PVE.qemu.PCIInputPanel', { var count = 0; pcisel.getStore().each(function(record) { if (record.data.iommugroup === iommu && - record.data.id.substring(0,5) !== id) + record.data.id.substring(0, 5) !== id) { count++; return false; @@ -139,7 +139,7 @@ Ext.define('PVE.qemu.PCIInputPanel', { itemId: 'iommuwarning', value: 'The selected Device is not in a seperate' + 'IOMMU group, make sure this is intended.', - userCls: 'pmx-hint' + userCls: 'pmx-hint', }); me.items.insert(0, warning); me.updateLayout(); // insert does not trigger that @@ -150,14 +150,14 @@ Ext.define('PVE.qemu.PCIInputPanel', { if (pcidev.data.mdev) { mdevfield.setPciID(value); } - } - } + }, + }, }, { xtype: 'proxmoxcheckbox', fieldLabel: gettext('All Functions'), - name: 'multifunction' - } + name: 'multifunction', + }, ]; me.column2 = [ @@ -174,41 +174,41 @@ Ext.define('PVE.qemu.PCIInputPanel', { mf.setValue(false); } mf.setDisabled(!!value); - } - } + }, + }, }, { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Primary GPU'), - name: 'x-vga' - } + name: 'x-vga', + }, ]; me.advancedColumn1 = [ { xtype: 'proxmoxcheckbox', fieldLabel: 'ROM-Bar', - name: 'rombar' + name: 'rombar', }, { xtype: 'displayfield', submitValue: true, hidden: true, fieldLabel: 'ROM-File', - name: 'romfile' - } + name: 'romfile', + }, ]; me.advancedColumn2 = [ { xtype: 'proxmoxcheckbox', fieldLabel: 'PCI-Express', - name: 'pcie' - } + name: 'pcie', + }, ]; me.callParent(); - } + }, }); Ext.define('PVE.qemu.PCIEdit', { @@ -228,11 +228,11 @@ Ext.define('PVE.qemu.PCIEdit', { var ipanel = Ext.create('PVE.qemu.PCIInputPanel', { confid: me.confid, - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); Ext.apply(me, { - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -240,7 +240,7 @@ Ext.define('PVE.qemu.PCIEdit', { me.load({ success: function(response) { ipanel.setVMConfig(response.result.data); - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/ProcessorEdit.js b/www/manager6/qemu/ProcessorEdit.js index e65631e1..425a0af1 100644 --- a/www/manager6/qemu/ProcessorEdit.js +++ b/www/manager6/qemu/ProcessorEdit.js @@ -128,7 +128,7 @@ Ext.define('PVE.qemu.ProcessorInputPanel', { xtype: 'CPUModelSelector', name: 'cputype', reference: 'cputype', - fieldLabel: gettext('Type') + fieldLabel: gettext('Type'), }, { xtype: 'displayfield', @@ -178,8 +178,8 @@ Ext.define('PVE.qemu.ProcessorInputPanel', { step: 1, fieldLabel: gettext('CPU limit'), allowBlank: true, - emptyText: gettext('unlimited') - } + emptyText: gettext('unlimited'), + }, ], advancedColumn2: [ @@ -191,25 +191,25 @@ Ext.define('PVE.qemu.ProcessorInputPanel', { maxValue: 500000, value: '1024', deleteEmpty: true, - allowBlank: true + allowBlank: true, }, { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Enable NUMA'), name: 'numa', - uncheckedValue: 0 - } + uncheckedValue: 0, + }, ], advancedColumnB: [ { xtype: 'label', - text: 'Extra CPU Flags:' + text: 'Extra CPU Flags:', }, { xtype: 'vmcpuflagselector', - name: 'flags' - } - ] + name: 'flags', + }, + ], }); Ext.define('PVE.qemu.ProcessorEdit', { @@ -224,7 +224,7 @@ Ext.define('PVE.qemu.ProcessorEdit', { Ext.apply(me, { subject: gettext('Processors'), - items: ipanel + items: ipanel, }); me.callParent(); @@ -250,7 +250,7 @@ Ext.define('PVE.qemu.ProcessorEdit', { } } me.setValues(data); - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/RNGEdit.js b/www/manager6/qemu/RNGEdit.js index 9a15e462..50c777f7 100644 --- a/www/manager6/qemu/RNGEdit.js +++ b/www/manager6/qemu/RNGEdit.js @@ -15,7 +15,7 @@ Ext.define('PVE.qemu.RNGInputPanel', { var ret = PVE.Parser.printPropertyString(values); return { - rng0: ret + rng0: ret, }; }, @@ -34,15 +34,15 @@ Ext.define('PVE.qemu.RNGInputPanel', { change: function(el, newVal) { let limitWarning = this.lookupReference('limitWarning'); limitWarning.setHidden(!!newVal); - } + }, }, '#source': { change: function(el, newVal) { let limitWarning = this.lookupReference('sourceWarning'); limitWarning.setHidden(newVal !== '/dev/random'); - } - } - } + }, + }, + }, }, items: [{ @@ -55,8 +55,8 @@ Ext.define('PVE.qemu.RNGInputPanel', { comboItems: [ ['/dev/urandom', '/dev/urandom'], ['/dev/random', '/dev/random'], - ['/dev/hwrng', '/dev/hwrng'] - ] + ['/dev/hwrng', '/dev/hwrng'], + ], }, { xtype: 'numberfield', @@ -67,7 +67,7 @@ Ext.define('PVE.qemu.RNGInputPanel', { value: 1024, fieldLabel: gettext('Limit (Bytes/Period)'), labelWidth: 130, - emptyText: gettext('unlimited') + emptyText: gettext('unlimited'), }, { xtype: 'numberfield', @@ -83,15 +83,15 @@ Ext.define('PVE.qemu.RNGInputPanel', { reference: 'sourceWarning', value: gettext('Using /dev/random as entropy source is discouraged, as it can lead to host entropy starvation. /dev/urandom is preferred, and does not lead to a decrease in security in practice.'), userCls: 'pmx-hint', - hidden: true + hidden: true, }, { xtype: 'displayfield', reference: 'limitWarning', value: gettext('Disabling the limiter can potentially allow a guest to overload the host. Proceed with caution.'), userCls: 'pmx-hint', - hidden: true - }] + hidden: true, + }], }); Ext.define('PVE.qemu.RNGEdit', { @@ -100,7 +100,7 @@ Ext.define('PVE.qemu.RNGEdit', { subject: gettext('VirtIO RNG'), items: [{ - xtype: 'pveRNGInputPanel' + xtype: 'pveRNGInputPanel', }], initComponent : function() { @@ -117,8 +117,8 @@ Ext.define('PVE.qemu.RNGEdit', { if (rng0) { me.setValues(PVE.Parser.parsePropertyString(rng0)); } - } + }, }); } - } + }, }); diff --git a/www/manager6/qemu/SSHKey.js b/www/manager6/qemu/SSHKey.js index c79653bb..9ea8d834 100644 --- a/www/manager6/qemu/SSHKey.js +++ b/www/manager6/qemu/SSHKey.js @@ -24,7 +24,7 @@ Ext.define('PVE.qemu.SSHKeyInputPanel', { xtype: 'textarea', itemId: 'sshkeys', name: 'sshkeys', - height: 250 + height: 250, }, { xtype: 'filebutton', @@ -44,9 +44,9 @@ Ext.define('PVE.qemu.SSHKeyInputPanel', { }); }); btn.reset(); - } - } - } + }, + }, + }, ], initComponent: function() { @@ -57,7 +57,7 @@ Ext.define('PVE.qemu.SSHKeyInputPanel', { me.down('#filebutton').setVisible(false); } - } + }, }); Ext.define('PVE.qemu.SSHKeyEdit', { @@ -72,7 +72,7 @@ Ext.define('PVE.qemu.SSHKeyEdit', { Ext.apply(me, { subject: gettext('SSH Keys'), - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -85,8 +85,8 @@ Ext.define('PVE.qemu.SSHKeyEdit', { data.sshkeys = decodeURIComponent(data.sshkeys); ipanel.setValues(data); } - } + }, }); } - } + }, }); diff --git a/www/manager6/qemu/ScsiHwEdit.js b/www/manager6/qemu/ScsiHwEdit.js index a0d6c645..c1b887bf 100644 --- a/www/manager6/qemu/ScsiHwEdit.js +++ b/www/manager6/qemu/ScsiHwEdit.js @@ -10,12 +10,12 @@ Ext.define('PVE.qemu.ScsiHwEdit', { xtype: 'pveScsiHwSelector', name: 'scsihw', value: '__default__', - fieldLabel: gettext('Type') - } + fieldLabel: gettext('Type'), + }, }); me.callParent(); me.load(); - } + }, }); diff --git a/www/manager6/qemu/SerialEdit.js b/www/manager6/qemu/SerialEdit.js index 16e7aaa9..5bc2f6bf 100644 --- a/www/manager6/qemu/SerialEdit.js +++ b/www/manager6/qemu/SerialEdit.js @@ -43,9 +43,9 @@ Ext.define('PVE.qemu.SerialnputPanel', { return "This device is already in use."; } return true; - } - } - ] + }, + }, + ], }); Ext.define('PVE.qemu.SerialEdit', { @@ -66,7 +66,7 @@ Ext.define('PVE.qemu.SerialEdit', { var ipanel = Ext.create('PVE.qemu.SerialnputPanel', {}); Ext.apply(me, { - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -74,7 +74,7 @@ Ext.define('PVE.qemu.SerialEdit', { me.load({ success: function(response, options) { ipanel.setVMConfig(response.result.data); - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/Smbios1Edit.js b/www/manager6/qemu/Smbios1Edit.js index c43689dc..c55145e7 100644 --- a/www/manager6/qemu/Smbios1Edit.js +++ b/www/manager6/qemu/Smbios1Edit.js @@ -10,7 +10,7 @@ Ext.define('PVE.qemu.Smbios1InputPanel', { var me = this; var params = { - smbios1: PVE.Parser.printQemuSmbios1(values) + smbios1: PVE.Parser.printQemuSmbios1(values), }; return params; @@ -29,63 +29,63 @@ Ext.define('PVE.qemu.Smbios1InputPanel', { xtype: 'textfield', fieldLabel: 'UUID', regex: /^[a-fA-F0-9]{8}(?:-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$/, - name: 'uuid' + name: 'uuid', }, { xtype: 'textareafield', fieldLabel: gettext('Manufacturer'), fieldStyle: { height: '2em', - minHeight: '2em' + minHeight: '2em', }, - name: 'manufacturer' + name: 'manufacturer', }, { xtype: 'textareafield', fieldLabel: gettext('Product'), fieldStyle: { height: '2em', - minHeight: '2em' + minHeight: '2em', }, - name: 'product' + name: 'product', }, { xtype: 'textareafield', fieldLabel: gettext('Version'), fieldStyle: { height: '2em', - minHeight: '2em' + minHeight: '2em', }, - name: 'version' + name: 'version', }, { xtype: 'textareafield', fieldLabel: gettext('Serial'), fieldStyle: { height: '2em', - minHeight: '2em' + minHeight: '2em', }, - name: 'serial' + name: 'serial', }, { xtype: 'textareafield', fieldLabel: 'SKU', fieldStyle: { height: '2em', - minHeight: '2em' + minHeight: '2em', }, - name: 'sku' + name: 'sku', }, { xtype: 'textareafield', fieldLabel: gettext('Family'), fieldStyle: { height: '2em', - minHeight: '2em' + minHeight: '2em', }, - name: 'family' - } - ] + name: 'family', + }, + ], }); Ext.define('PVE.qemu.Smbios1Edit', { @@ -100,7 +100,7 @@ Ext.define('PVE.qemu.Smbios1Edit', { Ext.applyIf(me, { subject: gettext('SMBIOS settings (type1)'), width: 450, - items: ipanel + items: ipanel, }); me.callParent(); @@ -119,7 +119,7 @@ Ext.define('PVE.qemu.Smbios1Edit', { } ipanel.setSmbios1(data); } - } + }, }); - } + }, }); diff --git a/www/manager6/qemu/SystemEdit.js b/www/manager6/qemu/SystemEdit.js index 9c9591d9..8ed367fb 100644 --- a/www/manager6/qemu/SystemEdit.js +++ b/www/manager6/qemu/SystemEdit.js @@ -7,19 +7,19 @@ Ext.define('PVE.qemu.SystemInputPanel', { viewModel: { data: { efi: false, - addefi: true + addefi: true, }, formulas: { efidisk: function(get) { return get('efi') && get('addefi'); - } - } + }, + }, }, onGetValues: function(values) { - if (values.vga && values.vga.substr(0,6) === 'serial') { - values['serial' + values.vga.substr(6,1)] = 'socket'; + if (values.vga && values.vga.substr(0, 6) === 'serial') { + values['serial' + values.vga.substr(6, 1)] = 'socket'; } var efidrive = {}; @@ -63,12 +63,12 @@ Ext.define('PVE.qemu.SystemInputPanel', { control: { 'pveScsiHwSelector': { - change: 'scsihwChange' + change: 'scsihwChange', }, 'pveQemuBiosSelector': { - change: 'biosChange' - } - } + change: 'biosChange', + }, + }, }, column1: [ @@ -78,7 +78,7 @@ Ext.define('PVE.qemu.SystemInputPanel', { deleteEmpty: false, fieldLabel: gettext('Graphic card'), name: 'vga', - comboItems: PVE.Utils.kvm_vga_driver_array() + comboItems: PVE.Utils.kvm_vga_driver_array(), }, { xtype: 'proxmoxcheckbox', @@ -86,8 +86,8 @@ Ext.define('PVE.qemu.SystemInputPanel', { uncheckedValue: 0, defaultValue: 0, deleteDefaultValue: true, - fieldLabel: gettext('Qemu Agent') - } + fieldLabel: gettext('Qemu Agent'), + }, ], column2: [ @@ -96,10 +96,10 @@ Ext.define('PVE.qemu.SystemInputPanel', { name: 'scsihw', value: '__default__', bind: { - value: '{current.scsihw}' + value: '{current.scsihw}', }, - fieldLabel: gettext('SCSI Controller') - } + fieldLabel: gettext('SCSI Controller'), + }, ], advancedColumn1: [ @@ -107,19 +107,19 @@ Ext.define('PVE.qemu.SystemInputPanel', { xtype: 'pveQemuBiosSelector', name: 'bios', value: '__default__', - fieldLabel: 'BIOS' + fieldLabel: 'BIOS', }, { xtype: 'proxmoxcheckbox', bind: { value: '{addefi}', hidden: '{!efi}', - disabled: '{!efi}' + disabled: '{!efi}', }, hidden: true, submitValue: false, disabled: true, - fieldLabel: gettext('Add EFI Disk') + fieldLabel: gettext('Add EFI Disk'), }, { xtype: 'pveDiskStorageSelector', @@ -128,13 +128,13 @@ Ext.define('PVE.qemu.SystemInputPanel', { bind: { nodename: '{nodename}', hidden: '{!efi}', - disabled: '{!efidisk}' + disabled: '{!efidisk}', }, autoSelect: false, disabled: true, hidden: true, - hideSize: true - } + hideSize: true, + }, ], advancedColumn2: [ @@ -145,9 +145,9 @@ Ext.define('PVE.qemu.SystemInputPanel', { fieldLabel: gettext('Machine'), comboItems: [ ['__default__', PVE.Utils.render_qemu_machine('')], - ['q35', 'q35'] - ] - } - ] + ['q35', 'q35'], + ], + }, + ], }); diff --git a/www/manager6/qemu/USBEdit.js b/www/manager6/qemu/USBEdit.js index 830cd1e7..05df4e7a 100644 --- a/www/manager6/qemu/USBEdit.js +++ b/www/manager6/qemu/USBEdit.js @@ -6,7 +6,7 @@ Ext.define('PVE.qemu.USBInputPanel', { onlineHelp: 'qm_usb_passthrough', viewModel: { - data: {} + data: {}, }, setVMConfig: function(vmconfig) { @@ -59,14 +59,14 @@ Ext.define('PVE.qemu.USBInputPanel', { inputValue: 'spice', boxLabel: gettext('Spice Port'), submitValue: false, - checked: true + checked: true, }, { name: 'usb', inputValue: 'hostdevice', boxLabel: gettext('Use USB Vendor/Device ID'), reference: 'hostdevice', - submitValue: false + submitValue: false, }, { xtype: 'pveUSBSelector', @@ -85,7 +85,7 @@ Ext.define('PVE.qemu.USBInputPanel', { inputValue: 'port', boxLabel: gettext('Use USB Port'), reference: 'port', - submitValue: false + submitValue: false, }, { xtype: 'pveUSBSelector', @@ -105,11 +105,11 @@ Ext.define('PVE.qemu.USBInputPanel', { inputValue: true, checked: true, reference: 'usb3', - fieldLabel: gettext('Use USB3') - } - ] - } - ] + fieldLabel: gettext('Use USB3'), + }, + ], + }, + ], }); Ext.define('PVE.qemu.USBEdit', { @@ -128,11 +128,11 @@ Ext.define('PVE.qemu.USBEdit', { var ipanel = Ext.create('PVE.qemu.USBInputPanel', { confid: me.confid, - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); Ext.apply(me, { - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -151,7 +151,7 @@ Ext.define('PVE.qemu.USBEdit', { for (let i = 0; i < data.length; i++) { if (/^(host=)?(0x)?[a-zA-Z0-9]{4}\:(0x)?[a-zA-Z0-9]{4}$/.test(data[i])) { hostdevice = data[i]; - hostdevice = hostdevice.replace('host=', '').replace('0x',''); + hostdevice = hostdevice.replace('host=', '').replace('0x', ''); type = 'hostdevice'; } else if (/^(host=)?(\d+)\-(\d+(\.\d+)*)$/.test(data[i])) { port = data[i]; @@ -167,11 +167,11 @@ Ext.define('PVE.qemu.USBEdit', { usb : type, hostdevice: hostdevice, port: port, - usb3: usb3 + usb3: usb3, }; ipanel.setValues(values); - } + }, }); - } + }, }); diff --git a/www/manager6/sdn/Browser.js b/www/manager6/sdn/Browser.js index 1415f966..35a5d13a 100644 --- a/www/manager6/sdn/Browser.js +++ b/www/manager6/sdn/Browser.js @@ -22,7 +22,7 @@ Ext.define('PVE.sdn.Browser', { Ext.apply(me, { title: Ext.String.format(gettext("Zone {0} on node {1}"), "'" + sdnid + "'", "'" + nodename + "'"), - hstateid: 'sdntab' + hstateid: 'sdntab', }); if (caps.sdn['SDN.Audit']) { @@ -30,7 +30,7 @@ Ext.define('PVE.sdn.Browser', { xtype: 'pveSDNZoneContentView', title: gettext('Content'), iconCls: 'fa fa-th', - itemId: 'content' + itemId: 'content', }); } @@ -40,10 +40,10 @@ Ext.define('PVE.sdn.Browser', { title: gettext('Permissions'), iconCls: 'fa fa-unlock', itemId: 'permissions', - path: '/sdn/zones/' + sdnid + path: '/sdn/zones/' + sdnid, }); } me.callParent(); - } + }, }); diff --git a/www/manager6/sdn/ControllerView.js b/www/manager6/sdn/ControllerView.js index 0d991af3..0595df87 100644 --- a/www/manager6/sdn/ControllerView.js +++ b/www/manager6/sdn/ControllerView.js @@ -19,8 +19,8 @@ Ext.define('PVE.sdn.ControllerView', { controllerid: sid, autoShow: true, listeners: { - destroy: this.reloadStore - } + destroy: this.reloadStore, + }, }); }, @@ -31,11 +31,11 @@ Ext.define('PVE.sdn.ControllerView', { model: 'pve-sdn-controller', proxy: { type: 'proxmox', - url: "/api2/json/cluster/sdn/controllers" + url: "/api2/json/cluster/sdn/controllers", }, sorters: { property: 'controller', - order: 'DESC' + order: 'DESC', }, }); @@ -60,13 +60,13 @@ Ext.define('PVE.sdn.ControllerView', { text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); var remove_btn = Ext.create('Proxmox.button.StdRemoveButton', { selModel: sm, baseurl: '/cluster/sdn/controllers/', - callback: reload + callback: reload, }); // else we cannot dynamically generate the add menu handlers @@ -83,7 +83,7 @@ Ext.define('PVE.sdn.ControllerView', { addMenuItems.push({ text: PVE.Utils.format_sdncontroller_type(type), iconCls: 'fa fa-fw fa-' + controller.faIcon, - handler: addHandleGenerator(type) + handler: addHandleGenerator(type), }); } @@ -92,14 +92,14 @@ Ext.define('PVE.sdn.ControllerView', { reloadStore: reload, selModel: sm, viewConfig: { - trackOver: false + trackOver: false, }, tbar: [ { text: gettext('Add'), menu: new Ext.menu.Menu({ - items: addMenuItems - }) + items: addMenuItems, + }), }, remove_btn, edit_btn, @@ -109,22 +109,22 @@ Ext.define('PVE.sdn.ControllerView', { header: 'ID', flex: 2, sortable: true, - dataIndex: 'controller' + dataIndex: 'controller', }, { header: gettext('Type'), flex: 1, sortable: true, dataIndex: 'type', - renderer: PVE.Utils.format_sdncontroller_type + renderer: PVE.Utils.format_sdncontroller_type, }, ], listeners: { activate: reload, - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/sdn/Status.js b/www/manager6/sdn/Status.js index 870ebb94..2ad02809 100644 --- a/www/manager6/sdn/Status.js +++ b/www/manager6/sdn/Status.js @@ -6,7 +6,7 @@ Ext.define('PVE.sdn.Status', { layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, initComponent: function() { @@ -19,8 +19,8 @@ Ext.define('PVE.sdn.Status', { groupField: 'type', proxy: { type: 'proxmox', - url: '/api2/json/cluster/resources' - } + url: '/api2/json/cluster/resources', + }, }); me.items = [{ @@ -29,10 +29,10 @@ Ext.define('PVE.sdn.Status', { rstore: me.rstore, border: 0, collapsible: true, - padding: '0 0 20 0' + padding: '0 0 20 0', }]; me.callParent(); me.on('activate', me.rstore.startUpdate); - } + }, }); diff --git a/www/manager6/sdn/StatusView.js b/www/manager6/sdn/StatusView.js index 6bc83bff..78df7eee 100644 --- a/www/manager6/sdn/StatusView.js +++ b/www/manager6/sdn/StatusView.js @@ -25,13 +25,13 @@ Ext.define('PVE.sdn.StatusView', { var p1 = me.sortPriority[rec1.data.type]; var p2 = me.sortPriority[rec2.data.type]; return (p1 !== p2) ? ((p1 > p2) ? 1 : -1) : 0; - } + }, }], filters: { property: 'type', value: 'sdn', - operator: '==' - } + operator: '==', + }, }); Ext.apply(me, { @@ -47,32 +47,32 @@ Ext.define('PVE.sdn.StatusView', { waitMsgTarget: me, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - } + }, }); - } + }, }, ], viewConfig: { - trackOver: false + trackOver: false, }, columns: [ { header: 'SDN', width: 80, - dataIndex: 'sdn' + dataIndex: 'sdn', }, { header: gettext('Node'), width: 80, - dataIndex: 'node' + dataIndex: 'node', }, { header: gettext('Status'), width: 80, flex: 1, - dataIndex: 'status' - } - ] + dataIndex: 'status', + }, + ], }); me.callParent(); @@ -80,7 +80,7 @@ Ext.define('PVE.sdn.StatusView', { me.on('activate', me.rstore.startUpdate); me.on('destroy', me.rstore.stopUpdate); - } + }, }, function() { Ext.define('pve-sdn-status', { @@ -88,7 +88,7 @@ Ext.define('PVE.sdn.StatusView', { fields: [ 'id', 'type', 'node', 'status', 'sdn', ], - idProperty: 'id' + idProperty: 'id', }); }); diff --git a/www/manager6/sdn/VnetEdit.js b/www/manager6/sdn/VnetEdit.js index aa40b41f..e959ffd1 100644 --- a/www/manager6/sdn/VnetEdit.js +++ b/www/manager6/sdn/VnetEdit.js @@ -60,7 +60,7 @@ Ext.define('PVE.sdn.VnetInputPanel', { name: 'vlanaware', uncheckedValue: 0, checked: false, - fieldLabel: gettext('VLAN Aware') + fieldLabel: gettext('VLAN Aware'), }, { xtype: 'textfield', diff --git a/www/manager6/sdn/VnetView.js b/www/manager6/sdn/VnetView.js index e73632d1..08a43dc6 100644 --- a/www/manager6/sdn/VnetView.js +++ b/www/manager6/sdn/VnetView.js @@ -14,12 +14,12 @@ Ext.define('PVE.sdn.VnetView', { model: 'pve-sdn-vnet', proxy: { type: 'proxmox', - url: "/api2/json/cluster/sdn/vnets" + url: "/api2/json/cluster/sdn/vnets", }, sorters: { property: 'vnet', - order: 'DESC' - } + order: 'DESC', + }, }); let reload = () => store.load(); @@ -28,7 +28,7 @@ Ext.define('PVE.sdn.VnetView', { let run_editor = function() { let rec = sm.getSelection()[0]; - let win = Ext.create('PVE.sdn.VnetEdit',{ + let win = Ext.create('PVE.sdn.VnetEdit', { autoShow: true, onlineHelp: 'pvesdn_config_vnet', vnet: rec.data.vnet, @@ -46,7 +46,7 @@ Ext.define('PVE.sdn.VnetView', { let remove_btn = Ext.create('Proxmox.button.StdRemoveButton', { selModel: sm, baseurl: '/cluster/sdn/vnets/', - callback: reload + callback: reload, }); Ext.apply(me, { @@ -54,7 +54,7 @@ Ext.define('PVE.sdn.VnetView', { reloadStore: reload, selModel: sm, viewConfig: { - trackOver: false + trackOver: false, }, tbar: [ { @@ -66,7 +66,7 @@ Ext.define('PVE.sdn.VnetView', { type: 'vnet', }); win.on('destroy', reload); - } + }, }, remove_btn, edit_btn, @@ -75,7 +75,7 @@ Ext.define('PVE.sdn.VnetView', { { header: 'ID', flex: 2, - dataIndex: 'vnet' + dataIndex: 'vnet', }, { header: gettext('Alias'), @@ -111,16 +111,16 @@ Ext.define('PVE.sdn.VnetView', { header: 'MAC', flex: 1, dataIndex: 'mac', - } + }, ], listeners: { activate: reload, - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }); me.callParent(); - } + }, }, function() { Ext.define('pve-sdn-vnet', { @@ -135,7 +135,7 @@ Ext.define('PVE.sdn.VnetView', { 'vnet', 'zone', ], - idProperty: 'vnet' + idProperty: 'vnet', }); }); diff --git a/www/manager6/sdn/ZoneContentView.js b/www/manager6/sdn/ZoneContentView.js index 20a5fe1e..8fd365be 100644 --- a/www/manager6/sdn/ZoneContentView.js +++ b/www/manager6/sdn/ZoneContentView.js @@ -6,13 +6,13 @@ Ext.define('PVE.sdn.ZoneContentView', { stateId: 'grid-sdnzone-content', viewConfig: { trackOver: false, - loadMask: false + loadMask: false, }, features: [ { ftype: 'grouping', - groupHeaderTpl: '{name} ({rows.length} Item{[values.rows.length > 1 ? "s" : ""]})' - } + groupHeaderTpl: '{name} ({rows.length} Item{[values.rows.length > 1 ? "s" : ""]})', + }, ], initComponent : function() { var me = this; @@ -28,17 +28,17 @@ Ext.define('PVE.sdn.ZoneContentView', { } var baseurl = "/nodes/" + nodename + "/sdn/zones/" + zone + "/content"; - var store = Ext.create('Ext.data.Store',{ + var store = Ext.create('Ext.data.Store', { model: 'pve-sdnzone-content', groupField: 'content', proxy: { type: 'proxmox', - url: '/api2/json' + baseurl + url: '/api2/json' + baseurl, }, sorters: { property: 'vnet', - order: 'DESC' - } + order: 'DESC', + }, }); var sm = Ext.create('Ext.selection.RowModel', {}); @@ -59,7 +59,7 @@ Ext.define('PVE.sdn.ZoneContentView', { header: 'VNet', flex: 1, sortable: true, - dataIndex: 'vnet' + dataIndex: 'vnet', }, { header: gettext('Status'), @@ -73,13 +73,13 @@ Ext.define('PVE.sdn.ZoneContentView', { }, ], listeners: { - activate: reload - } + activate: reload, + }, }); me.callParent(); - } + }, }, function() { Ext.define('pve-sdnzone-content', { @@ -95,10 +95,10 @@ Ext.define('PVE.sdn.ZoneContentView', { return value; } return PVE.Utils.format_sdnvnet_type(value, {}, record); - } - } + }, + }, ], - idProperty: 'vnet' + idProperty: 'vnet', }); }); diff --git a/www/manager6/sdn/ZoneView.js b/www/manager6/sdn/ZoneView.js index 7b664537..3c24af3f 100644 --- a/www/manager6/sdn/ZoneView.js +++ b/www/manager6/sdn/ZoneView.js @@ -19,8 +19,8 @@ Ext.define('PVE.sdn.ZoneView', { zone: sid, autoShow: true, listeners: { - destroy: this.reloadStore - } + destroy: this.reloadStore, + }, }); }, @@ -31,11 +31,11 @@ Ext.define('PVE.sdn.ZoneView', { model: 'pve-sdn-zone', proxy: { type: 'proxmox', - url: "/api2/json/cluster/sdn/zones" + url: "/api2/json/cluster/sdn/zones", }, sorters: { property: 'zone', - order: 'DESC' + order: 'DESC', }, }); @@ -60,13 +60,13 @@ Ext.define('PVE.sdn.ZoneView', { text: gettext('Edit'), disabled: true, selModel: sm, - handler: run_editor + handler: run_editor, }); let remove_btn = Ext.create('Proxmox.button.StdRemoveButton', { selModel: sm, baseurl: '/cluster/sdn/zones/', - callback: reload + callback: reload, }); // else we cannot dynamically generate the add menu handlers @@ -83,7 +83,7 @@ Ext.define('PVE.sdn.ZoneView', { addMenuItems.push({ text: PVE.Utils.format_sdnzone_type(type), iconCls: 'fa fa-fw fa-' + zone.faIcon, - handler: addHandleGenerator(type) + handler: addHandleGenerator(type), }); } @@ -92,14 +92,14 @@ Ext.define('PVE.sdn.ZoneView', { reloadStore: reload, selModel: sm, viewConfig: { - trackOver: false + trackOver: false, }, tbar: [ { text: gettext('Add'), menu: new Ext.menu.Menu({ - items: addMenuItems - }) + items: addMenuItems, + }), }, remove_btn, edit_btn, @@ -108,13 +108,13 @@ Ext.define('PVE.sdn.ZoneView', { { header: 'ID', flex: 2, - dataIndex: 'zone' + dataIndex: 'zone', }, { header: gettext('Type'), flex: 1, dataIndex: 'type', - renderer: PVE.Utils.format_sdnzone_type + renderer: PVE.Utils.format_sdnzone_type, }, { header: 'MTU', @@ -129,10 +129,10 @@ Ext.define('PVE.sdn.ZoneView', { ], listeners: { activate: reload, - itemdblclick: run_editor - } + itemdblclick: run_editor, + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/sdn/controllers/Base.js b/www/manager6/sdn/controllers/Base.js index f187ed90..11c3b89b 100644 --- a/www/manager6/sdn/controllers/Base.js +++ b/www/manager6/sdn/controllers/Base.js @@ -35,13 +35,13 @@ Ext.define('PVE.sdn.controllers.BaseEdit', { var ipanel = Ext.create(me.paneltype, { type: me.type, isCreate: me.isCreate, - controllerid: me.controllerid + controllerid: me.controllerid, }); Ext.apply(me, { subject: PVE.Utils.format_sdncontroller_type(me.type), isAdd: true, - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -60,8 +60,8 @@ Ext.define('PVE.sdn.controllers.BaseEdit', { values.enable = values.disable ? 0 : 1; ipanel.setValues(values); - } + }, }); } - } + }, }); diff --git a/www/manager6/sdn/controllers/EvpnEdit.js b/www/manager6/sdn/controllers/EvpnEdit.js index 125a8fc7..10e358f9 100644 --- a/www/manager6/sdn/controllers/EvpnEdit.js +++ b/www/manager6/sdn/controllers/EvpnEdit.js @@ -13,7 +13,7 @@ Ext.define('PVE.sdn.controllers.EvpnInputPanel', { maxLength: 8, value: me.controllerid || '', fieldLabel: 'ID', - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxintegerfield', @@ -22,29 +22,29 @@ Ext.define('PVE.sdn.controllers.EvpnInputPanel', { maxValue: 4294967295, value: 65000, fieldLabel: 'ASN #', - allowBlank: false + allowBlank: false, }, { xtype: 'textfield', name: 'peers', fieldLabel: gettext('Peers'), - allowBlank: false + allowBlank: false, }, { xtype: 'textfield', name: 'gateway-external-peers', fieldLabel: gettext('External Gateway Peers'), - allowBlank: true + allowBlank: true, }, { xtype: 'pveNodeSelector', name: 'gateway-nodes', fieldLabel: gettext('Gateway Nodes'), multiSelect: true, - autoSelect: false + autoSelect: false, }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/sdn/zones/Base.js b/www/manager6/sdn/zones/Base.js index 724ae317..f9200286 100644 --- a/www/manager6/sdn/zones/Base.js +++ b/www/manager6/sdn/zones/Base.js @@ -19,7 +19,7 @@ Ext.define('PVE.panel.SDNZoneBase', { var me = this; me.callParent(); - } + }, }); Ext.define('PVE.sdn.zones.BaseEdit', { @@ -41,13 +41,13 @@ Ext.define('PVE.sdn.zones.BaseEdit', { var ipanel = Ext.create(me.paneltype, { type: me.type, isCreate: me.isCreate, - zone: me.zone + zone: me.zone, }); Ext.apply(me, { subject: PVE.Utils.format_sdnzone_type(me.type), isAdd: true, - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -66,8 +66,8 @@ Ext.define('PVE.sdn.zones.BaseEdit', { values.enable = values.disable ? 0 : 1; ipanel.setValues(values); - } + }, }); } - } + }, }); diff --git a/www/manager6/sdn/zones/EvpnEdit.js b/www/manager6/sdn/zones/EvpnEdit.js index f5a9560e..7a314c56 100644 --- a/www/manager6/sdn/zones/EvpnEdit.js +++ b/www/manager6/sdn/zones/EvpnEdit.js @@ -25,7 +25,7 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', { maxLength: 8, value: me.zone || '', fieldLabel: 'ID', - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxintegerfield', @@ -33,14 +33,14 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', { minValue: 1, maxValue: 16000000, fieldLabel: 'VRF-VXLAN Tag', - allowBlank: false + allowBlank: false, }, { xtype: 'pveSDNControllerSelector', fieldLabel: gettext('Controller'), name: 'controller', value: '', - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxintegerfield', @@ -50,7 +50,7 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', { fieldLabel: 'MTU', skipEmptyText: true, allowBlank: true, - emptyText: 'auto' + emptyText: 'auto', }, { xtype: 'pveNodeSelector', @@ -58,11 +58,11 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', { fieldLabel: gettext('Nodes'), emptyText: gettext('All') + ' (' + gettext('No restrictions') +')', multiSelect: true, - autoSelect: false + autoSelect: false, }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/sdn/zones/QinQEdit.js b/www/manager6/sdn/zones/QinQEdit.js index 477604a3..5d384775 100644 --- a/www/manager6/sdn/zones/QinQEdit.js +++ b/www/manager6/sdn/zones/QinQEdit.js @@ -25,7 +25,7 @@ Ext.define('PVE.sdn.zones.QinQInputPanel', { maxLength: 8, value: me.zone || '', fieldLabel: 'ID', - allowBlank: false + allowBlank: false, }, { xtype: 'textfield', @@ -39,7 +39,7 @@ Ext.define('PVE.sdn.zones.QinQInputPanel', { minValue: 0, maxValue: 4096, fieldLabel: gettext('Service VLAN'), - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxKVComboBox', @@ -60,7 +60,7 @@ Ext.define('PVE.sdn.zones.QinQInputPanel', { fieldLabel: 'MTU', skipEmptyText: true, allowBlank: true, - emptyText: 'auto' + emptyText: 'auto', }, { xtype: 'pveNodeSelector', @@ -68,10 +68,10 @@ Ext.define('PVE.sdn.zones.QinQInputPanel', { fieldLabel: gettext('Nodes'), emptyText: gettext('All') + ' (' + gettext('No restrictions') +')', multiSelect: true, - autoSelect: false + autoSelect: false, }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/sdn/zones/SimpleEdit.js b/www/manager6/sdn/zones/SimpleEdit.js index 7e2d8dd7..8518f97e 100644 --- a/www/manager6/sdn/zones/SimpleEdit.js +++ b/www/manager6/sdn/zones/SimpleEdit.js @@ -25,7 +25,7 @@ Ext.define('PVE.sdn.zones.SimpleInputPanel', { maxLength: 10, value: me.zone || '', fieldLabel: 'ID', - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxintegerfield', @@ -35,7 +35,7 @@ Ext.define('PVE.sdn.zones.SimpleInputPanel', { fieldLabel: 'MTU', skipEmptyText: true, allowBlank: true, - emptyText: 'auto' + emptyText: 'auto', }, { xtype: 'pveNodeSelector', @@ -43,11 +43,11 @@ Ext.define('PVE.sdn.zones.SimpleInputPanel', { fieldLabel: gettext('Nodes'), emptyText: gettext('All') + ' (' + gettext('No restrictions') +')', multiSelect: true, - autoSelect: false + autoSelect: false, }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/sdn/zones/VlanEdit.js b/www/manager6/sdn/zones/VlanEdit.js index 79b6bc39..8b7eedd7 100644 --- a/www/manager6/sdn/zones/VlanEdit.js +++ b/www/manager6/sdn/zones/VlanEdit.js @@ -25,7 +25,7 @@ Ext.define('PVE.sdn.zones.VlanInputPanel', { maxLength: 10, value: me.zone || '', fieldLabel: 'ID', - allowBlank: false + allowBlank: false, }, { xtype: 'textfield', @@ -41,7 +41,7 @@ Ext.define('PVE.sdn.zones.VlanInputPanel', { fieldLabel: 'MTU', skipEmptyText: true, allowBlank: true, - emptyText: 'auto' + emptyText: 'auto', }, { xtype: 'pveNodeSelector', @@ -49,11 +49,11 @@ Ext.define('PVE.sdn.zones.VlanInputPanel', { fieldLabel: gettext('Nodes'), emptyText: gettext('All') + ' (' + gettext('No restrictions') +')', multiSelect: true, - autoSelect: false + autoSelect: false, }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/sdn/zones/VxlanEdit.js b/www/manager6/sdn/zones/VxlanEdit.js index 4d8c1719..3ee4af8c 100644 --- a/www/manager6/sdn/zones/VxlanEdit.js +++ b/www/manager6/sdn/zones/VxlanEdit.js @@ -27,7 +27,7 @@ Ext.define('PVE.sdn.zones.VxlanInputPanel', { name: 'zone', value: me.zone || '', fieldLabel: 'ID', - allowBlank: false + allowBlank: false, }, { xtype: 'textfield', @@ -43,7 +43,7 @@ Ext.define('PVE.sdn.zones.VxlanInputPanel', { fieldLabel: 'MTU', skipEmptyText: true, allowBlank: true, - emptyText: 'auto' + emptyText: 'auto', }, { xtype: 'pveNodeSelector', @@ -51,11 +51,11 @@ Ext.define('PVE.sdn.zones.VxlanInputPanel', { fieldLabel: gettext('Nodes'), emptyText: gettext('All') + ' (' + gettext('No restrictions') +')', multiSelect: true, - autoSelect: false + autoSelect: false, }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/storage/BackupView.js b/www/manager6/storage/BackupView.js index 8c5a286d..87d446ca 100644 --- a/www/manager6/storage/BackupView.js +++ b/www/manager6/storage/BackupView.js @@ -94,25 +94,25 @@ Ext.define('PVE.storage.BackupView', { nodename: nodename, volid: rec.data.volid, volidText: PVE.Utils.render_storage_content(rec.data.volid, {}, rec), - vmtype: vmtype + vmtype: vmtype, }); win.show(); win.on('destroy', reload); - } + }, }, { xtype: 'proxmoxButton', text: gettext('Show Configuration'), disabled: true, selModel: sm, - handler: function(b,e,rec) { + handler: function(b, e, rec) { var win = Ext.create('PVE.window.BackupConfig', { volume: rec.data.volid, - pveSelNode: me.pveSelNode + pveSelNode: me.pveSelNode, }); win.show(); - } + }, }, pruneButton, ]; @@ -128,7 +128,7 @@ Ext.define('PVE.storage.BackupView', { header: gettext('Verify State'), dataIndex: 'verification', renderer: PVE.Utils.render_backup_verification, - } + }, }; } diff --git a/www/manager6/storage/Base.js b/www/manager6/storage/Base.js index 45fa2bb3..9f3d6ee1 100644 --- a/www/manager6/storage/Base.js +++ b/www/manager6/storage/Base.js @@ -28,7 +28,7 @@ Ext.define('PVE.panel.StorageBase', { value: me.storageId || '', fieldLabel: 'ID', vtype: 'StorageId', - allowBlank: false + allowBlank: false, }); me.column2 = me.column2 || []; @@ -40,19 +40,19 @@ Ext.define('PVE.panel.StorageBase', { fieldLabel: gettext('Nodes'), emptyText: gettext('All') + ' (' + gettext('No restrictions') +')', multiSelect: true, - autoSelect: false + autoSelect: false, }, { xtype: 'proxmoxcheckbox', name: 'enable', checked: true, uncheckedValue: 0, - fieldLabel: gettext('Enable') - } + fieldLabel: gettext('Enable'), + }, ); me.callParent(); - } + }, }); Ext.define('PVE.panel.StoragePruneInputPanel', { @@ -78,7 +78,7 @@ Ext.define('PVE.panel.StoragePruneInputPanel', { } // always delete old 'maxfiles' on edit, we map it to keep-last on window load return { - delete: ['prune-backups','maxfiles'], + delete: ['prune-backups', 'maxfiles'], }; } let options = { 'prune-backups': retention }; @@ -178,7 +178,7 @@ Ext.define('PVE.storage.BaseEdit', { title: gettext('General'), type: me.type, isCreate: me.isCreate, - storageId: me.storageId + storageId: me.storageId, }); Ext.apply(me, { @@ -242,8 +242,8 @@ Ext.define('PVE.storage.BaseEdit', { me.query('inputpanel').forEach(panel => { panel.setValues(values); }); - } + }, }); } - } + }, }); diff --git a/www/manager6/storage/Browser.js b/www/manager6/storage/Browser.js index aeca8979..5fee94c7 100644 --- a/www/manager6/storage/Browser.js +++ b/www/manager6/storage/Browser.js @@ -23,8 +23,8 @@ Ext.define('PVE.storage.Browser', { title: gettext('Summary'), xtype: 'pveStorageSummary', iconCls: 'fa fa-book', - itemId: 'summary' - } + itemId: 'summary', + }, ]; var caps = Ext.state.Manager.get('GuiCap'); @@ -33,9 +33,9 @@ Ext.define('PVE.storage.Browser', { title: Ext.String.format( gettext("Storage {0} on node {1}"), `'${storeid}'`, - `'${nodename}'` + `'${nodename}'`, ), - hstateid: 'storagetab' + hstateid: 'storagetab', }); if (caps.storage['Datastore.Allocate'] || @@ -121,10 +121,10 @@ Ext.define('PVE.storage.Browser', { title: gettext('Permissions'), iconCls: 'fa fa-unlock', itemId: 'permissions', - path: '/storage/' + storeid + path: '/storage/' + storeid, }); } me.callParent(); - } + }, }); diff --git a/www/manager6/storage/CephFSEdit.js b/www/manager6/storage/CephFSEdit.js index 4d50aa14..2cf308a0 100644 --- a/www/manager6/storage/CephFSEdit.js +++ b/www/manager6/storage/CephFSEdit.js @@ -5,7 +5,7 @@ Ext.define('PVE.storage.CephFSInputPanel', { onlineHelp: 'storage_cephfs', viewModel: { - type: 'cephstorage' + type: 'cephstorage', }, setValues: function(values) { @@ -36,20 +36,20 @@ Ext.define('PVE.storage.CephFSInputPanel', { bind: { disabled: '{pveceph}', submitValue: '{!pveceph}', - hidden: '{pveceph}' + hidden: '{pveceph}', }, fieldLabel: 'Monitor(s)', - allowBlank: false + allowBlank: false, }, { xtype: 'displayfield', reference: 'monhost', bind: { disabled: '{!pveceph}', - hidden: '{!pveceph}' + hidden: '{!pveceph}', }, value: '', - fieldLabel: 'Monitor(s)' + fieldLabel: 'Monitor(s)', }, { xtype: me.isCreate ? 'textfield' : 'displayfield', @@ -57,11 +57,11 @@ Ext.define('PVE.storage.CephFSInputPanel', { value: 'admin', bind: { disabled: '{pveceph}', - submitValue: '{!pveceph}' + submitValue: '{!pveceph}', }, fieldLabel: gettext('User name'), - allowBlank: true - } + allowBlank: true, + }, ); me.column2 = [ @@ -72,7 +72,7 @@ Ext.define('PVE.storage.CephFSInputPanel', { name: 'content', value: 'backup', multiSelect: true, - allowBlank: false + allowBlank: false, }, ]; @@ -82,15 +82,15 @@ Ext.define('PVE.storage.CephFSInputPanel', { reference: 'pvecephRef', bind : { disabled: '{!pvecephPossible}', - value: '{pveceph}' + value: '{pveceph}', }, checked: true, uncheckedValue: 0, submitValue: false, hidden: !me.isCreate, - boxLabel: gettext('Use Proxmox VE managed hyper-converged cephFS') + boxLabel: gettext('Use Proxmox VE managed hyper-converged cephFS'), }]; me.callParent(); - } + }, }); diff --git a/www/manager6/storage/DirEdit.js b/www/manager6/storage/DirEdit.js index 8d7e78f2..8caa2d25 100644 --- a/www/manager6/storage/DirEdit.js +++ b/www/manager6/storage/DirEdit.js @@ -12,7 +12,7 @@ Ext.define('PVE.storage.DirInputPanel', { name: 'path', value: '', fieldLabel: gettext('Directory'), - allowBlank: false + allowBlank: false, }, { xtype: 'pveContentTypeSelector', @@ -20,8 +20,8 @@ Ext.define('PVE.storage.DirInputPanel', { value: 'images', multiSelect: true, fieldLabel: gettext('Content'), - allowBlank: false - } + allowBlank: false, + }, ]; me.column2 = [ @@ -29,10 +29,10 @@ Ext.define('PVE.storage.DirInputPanel', { xtype: 'proxmoxcheckbox', name: 'shared', uncheckedValue: 0, - fieldLabel: gettext('Shared') + fieldLabel: gettext('Shared'), }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/storage/GlusterFsEdit.js b/www/manager6/storage/GlusterFsEdit.js index d3c19d59..6a6cadc9 100644 --- a/www/manager6/storage/GlusterFsEdit.js +++ b/www/manager6/storage/GlusterFsEdit.js @@ -9,7 +9,7 @@ Ext.define('PVE.storage.GlusterFsScan', { matchFieldWidth: false, listConfig: { loadingText: 'Scanning...', - width: 350 + width: 350, }, doRawQuery: function() { }, @@ -43,18 +43,18 @@ Ext.define('PVE.storage.GlusterFsScan', { fields: [ 'volname' ], proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/scan/glusterfs' - } + url: '/api2/json/nodes/' + me.nodename + '/scan/glusterfs', + }, }); store.sort('volname', 'ASC'); Ext.apply(me, { - store: store + store: store, }); me.callParent(); - } + }, }); Ext.define('PVE.storage.GlusterFsInputPanel', { @@ -79,22 +79,22 @@ Ext.define('PVE.storage.GlusterFsInputPanel', { volumeField.setServer(value); volumeField.setValue(''); } - } - } + }, + }, }, { xtype: me.isCreate ? 'proxmoxtextfield' : 'displayfield', name: 'server2', value: '', fieldLabel: gettext('Second Server'), - allowBlank: true + allowBlank: true, }, { xtype: me.isCreate ? 'pveGlusterFsScan' : 'displayfield', name: 'volume', value: '', fieldLabel: 'Volume name', - allowBlank: false + allowBlank: false, }, { xtype: 'pveContentTypeSelector', @@ -103,10 +103,10 @@ Ext.define('PVE.storage.GlusterFsInputPanel', { value: 'images', multiSelect: true, fieldLabel: gettext('Content'), - allowBlank: false - } + allowBlank: false, + }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/storage/IScsiEdit.js b/www/manager6/storage/IScsiEdit.js index 0b7c91d7..df1d1253 100644 --- a/www/manager6/storage/IScsiEdit.js +++ b/www/manager6/storage/IScsiEdit.js @@ -8,7 +8,7 @@ Ext.define('PVE.storage.IScsiScan', { matchFieldWidth: false, listConfig: { loadingText: gettext('Scanning...'), - width: 350 + width: 350, }, doRawQuery: function() { }, @@ -42,18 +42,18 @@ Ext.define('PVE.storage.IScsiScan', { fields: [ 'target', 'portal' ], proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/scan/iscsi' - } + url: '/api2/json/nodes/' + me.nodename + '/scan/iscsi', + }, }); store.sort('target', 'ASC'); Ext.apply(me, { - store: store + store: store, }); me.callParent(); - } + }, }); Ext.define('PVE.storage.IScsiInputPanel', { @@ -92,8 +92,8 @@ Ext.define('PVE.storage.IScsiInputPanel', { exportField.setPortal(value); exportField.setValue(''); } - } - } + }, + }, }, { readOnly: !me.isCreate, @@ -101,8 +101,8 @@ Ext.define('PVE.storage.IScsiInputPanel', { name: 'target', value: '', fieldLabel: 'Target', - allowBlank: false - } + allowBlank: false, + }, ]; me.column2 = [ @@ -110,10 +110,10 @@ Ext.define('PVE.storage.IScsiInputPanel', { xtype: 'checkbox', name: 'luns', checked: true, - fieldLabel: gettext('Use LUNs directly') - } + fieldLabel: gettext('Use LUNs directly'), + }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/storage/ImageView.js b/www/manager6/storage/ImageView.js index d9f19035..28ffa48b 100644 --- a/www/manager6/storage/ImageView.js +++ b/www/manager6/storage/ImageView.js @@ -52,7 +52,7 @@ Ext.define('PVE.storage.ImageView', { Ext.Msg.show({ title: gettext('Cannot remove disk image.'), icon: Ext.Msg.ERROR, - msg: msg + msg: msg, }); return; } @@ -61,10 +61,10 @@ Ext.define('PVE.storage.ImageView', { title: Ext.String.format(gettext("Destroy '{0}'"), rec.data.volid), showProgress: true, url: url, - item: { type: 'Image', id: vmid } + item: { type: 'Image', id: vmid }, }).show(); win.on('destroy', reload); - } + }, }, ]; me.useCustomRemoveButton = true; diff --git a/www/manager6/storage/LVMEdit.js b/www/manager6/storage/LVMEdit.js index 4048f8bd..42d7173a 100644 --- a/www/manager6/storage/LVMEdit.js +++ b/www/manager6/storage/LVMEdit.js @@ -17,8 +17,8 @@ Ext.define('PVE.storage.VgSelector', { fields: [ 'vg', 'size', 'free' ], proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/scan/lvm' - } + url: '/api2/json/nodes/' + me.nodename + '/scan/lvm', + }, }); store.sort('vg', 'ASC'); @@ -26,12 +26,12 @@ Ext.define('PVE.storage.VgSelector', { Ext.apply(me, { store: store, listConfig: { - loadingText: gettext('Scanning...') - } + loadingText: gettext('Scanning...'), + }, }); me.callParent(); - } + }, }); Ext.define('PVE.storage.BaseStorageSelector', { @@ -51,8 +51,8 @@ Ext.define('PVE.storage.BaseStorageSelector', { autoLoad: { addRecords: true, params: { - type: 'iscsi' - } + type: 'iscsi', + }, }, fields: [ 'storage', 'type', 'content', { @@ -63,12 +63,12 @@ Ext.define('PVE.storage.BaseStorageSelector', { } else { return me.existingGroupsText; } - } + }, }], proxy: { type: 'proxmox', - url: '/api2/json/storage/' - } + url: '/api2/json/storage/', + }, }); store.loadData([{ storage: '' }], true); @@ -76,11 +76,11 @@ Ext.define('PVE.storage.BaseStorageSelector', { store.sort('storage', 'ASC'); Ext.apply(me, { - store: store + store: store, }); me.callParent(); - } + }, }); Ext.define('PVE.storage.LVMInputPanel', { @@ -99,14 +99,14 @@ Ext.define('PVE.storage.LVMInputPanel', { disabled: !!me.isCreate, value: '', fieldLabel: gettext('Volume group'), - allowBlank: false + allowBlank: false, }); if (me.isCreate) { var vgField = Ext.create('PVE.storage.VgSelector', { name: 'vgname', fieldLabel: gettext('Volume group'), - allowBlank: false + allowBlank: false, }); var baseField = Ext.createWidget('pveFileSelector', { @@ -116,7 +116,7 @@ Ext.define('PVE.storage.LVMInputPanel', { nodename: 'localhost', storageContent: 'images', fieldLabel: gettext('Base volume'), - allowBlank: false + allowBlank: false, }); me.column1.push({ @@ -142,8 +142,8 @@ Ext.define('PVE.storage.LVMInputPanel', { baseField.setDisabled(true); } baseField.setStorage(value); - } - } + }, + }, }); me.column1.push(baseField); @@ -162,7 +162,7 @@ Ext.define('PVE.storage.LVMInputPanel', { name: 'content', value: ['images', 'rootdir'], multiSelect: true, - allowBlank: false + allowBlank: false, }); me.column2 = [ @@ -170,10 +170,10 @@ Ext.define('PVE.storage.LVMInputPanel', { xtype: 'proxmoxcheckbox', name: 'shared', uncheckedValue: 0, - fieldLabel: gettext('Shared') - } + fieldLabel: gettext('Shared'), + }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/storage/LvmThinEdit.js b/www/manager6/storage/LvmThinEdit.js index 332700ae..238c8c17 100644 --- a/www/manager6/storage/LvmThinEdit.js +++ b/www/manager6/storage/LvmThinEdit.js @@ -39,8 +39,8 @@ Ext.define('PVE.storage.TPoolSelector', { fields: [ 'lv' ], proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/scan/lvmthin' - } + url: '/api2/json/nodes/' + me.nodename + '/scan/lvmthin', + }, }); store.sort('lv', 'ASC'); @@ -48,12 +48,12 @@ Ext.define('PVE.storage.TPoolSelector', { Ext.apply(me, { store: store, listConfig: { - loadingText: gettext('Scanning...') - } + loadingText: gettext('Scanning...'), + }, }); me.callParent(); - } + }, }); Ext.define('PVE.storage.BaseVGSelector', { @@ -76,19 +76,19 @@ Ext.define('PVE.storage.BaseVGSelector', { fields: [ 'vg', 'size', 'free'], proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/scan/lvm' - } + url: '/api2/json/nodes/' + me.nodename + '/scan/lvm', + }, }); Ext.apply(me, { store: store, listConfig: { - loadingText: gettext('Scanning...') - } + loadingText: gettext('Scanning...'), + }, }); me.callParent(); - } + }, }); Ext.define('PVE.storage.LvmThinInputPanel', { @@ -107,7 +107,7 @@ Ext.define('PVE.storage.LvmThinInputPanel', { disabled: !!me.isCreate, value: '', fieldLabel: gettext('Volume group'), - allowBlank: false + allowBlank: false, }); var thinpoolField = Ext.createWidget(me.isCreate ? 'textfield' : 'displayfield', { @@ -116,14 +116,14 @@ Ext.define('PVE.storage.LvmThinInputPanel', { disabled: !!me.isCreate, value: '', fieldLabel: gettext('Thin Pool'), - allowBlank: false + allowBlank: false, }); if (me.isCreate) { var vgField = Ext.create('PVE.storage.TPoolSelector', { name: 'thinpool', fieldLabel: gettext('Thin Pool'), - allowBlank: false + allowBlank: false, }); me.column1.push({ @@ -136,8 +136,8 @@ Ext.define('PVE.storage.LvmThinInputPanel', { vgField.setVG(value); vgField.setValue(''); } - } - } + }, + }, }); me.column1.push(vgField); @@ -156,11 +156,11 @@ Ext.define('PVE.storage.LvmThinInputPanel', { name: 'content', value: ['images', 'rootdir'], multiSelect: true, - allowBlank: false + allowBlank: false, }); me.column2 = []; me.callParent(); - } + }, }); diff --git a/www/manager6/storage/NFSEdit.js b/www/manager6/storage/NFSEdit.js index ea3160eb..807a9c52 100644 --- a/www/manager6/storage/NFSEdit.js +++ b/www/manager6/storage/NFSEdit.js @@ -9,7 +9,7 @@ Ext.define('PVE.storage.NFSScan', { matchFieldWidth: false, listConfig: { loadingText: gettext('Scanning...'), - width: 350 + width: 350, }, doRawQuery: function() { }, @@ -43,18 +43,18 @@ Ext.define('PVE.storage.NFSScan', { fields: [ 'path', 'options' ], proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/scan/nfs' - } + url: '/api2/json/nodes/' + me.nodename + '/scan/nfs', + }, }); store.sort('path', 'ASC'); Ext.apply(me, { - store: store + store: store, }); me.callParent(); - } + }, }); Ext.define('PVE.storage.NFSInputPanel', { @@ -123,15 +123,15 @@ Ext.define('PVE.storage.NFSInputPanel', { exportField.setServer(value); exportField.setValue(''); } - } - } + }, + }, }, { xtype: me.isCreate ? 'pveNFSScan' : 'displayfield', name: 'export', value: '', fieldLabel: 'Export', - allowBlank: false + allowBlank: false, }, { xtype: 'pveContentTypeSelector', @@ -139,8 +139,8 @@ Ext.define('PVE.storage.NFSInputPanel', { value: 'images', multiSelect: true, fieldLabel: gettext('Content'), - allowBlank: false - } + allowBlank: false, + }, ]; me.advancedColumn1 = [ @@ -155,11 +155,11 @@ Ext.define('PVE.storage.NFSInputPanel', { ['3', '3'], ['4', '4'], ['4.1', '4.1'], - ['4.2', '4.2'] - ] - } + ['4.2', '4.2'], + ], + }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/storage/RBDEdit.js b/www/manager6/storage/RBDEdit.js index 03cb1e5b..4732ee6a 100644 --- a/www/manager6/storage/RBDEdit.js +++ b/www/manager6/storage/RBDEdit.js @@ -4,8 +4,8 @@ Ext.define('PVE.storage.Ceph.Model', { data: { pveceph: true, - pvecephPossible: true - } + pvecephPossible: true, + }, }); Ext.define('PVE.storage.Ceph.Controller', { @@ -14,18 +14,18 @@ Ext.define('PVE.storage.Ceph.Controller', { control: { '#': { - afterrender: 'queryMonitors' + afterrender: 'queryMonitors', }, 'textfield[name=username]': { - disable: 'resetField' + disable: 'resetField', }, 'displayfield[name=monhost]': { - enable: 'queryMonitors' + enable: 'queryMonitors', }, 'textfield[name=monhost]': { disable: 'resetField', - enable: 'resetField' - } + enable: 'resetField', + }, }, resetField: function(field) { field.reset(); @@ -67,9 +67,9 @@ Ext.define('PVE.storage.Ceph.Controller', { vm.set('pveceph', false); vm.set('pvecephPossible', false); } - } + }, }); - } + }, }); Ext.define('PVE.storage.RBDInputPanel', { @@ -79,7 +79,7 @@ Ext.define('PVE.storage.RBDInputPanel', { onlineHelp: 'ceph_rados_block_devices', viewModel: { - type: 'cephstorage' + type: 'cephstorage', }, setValues: function(values) { @@ -109,21 +109,21 @@ Ext.define('PVE.storage.RBDInputPanel', { bind: { disabled: '{!pveceph}', submitValue: '{pveceph}', - hidden: '{!pveceph}' + hidden: '{!pveceph}', }, fieldLabel: gettext('Pool'), - allowBlank: false - },{ + allowBlank: false, + }, { xtype: 'textfield', name: 'pool', value: 'rbd', bind: { disabled: '{pveceph}', submitValue: '{!pveceph}', - hidden: '{pveceph}' + hidden: '{pveceph}', }, fieldLabel: gettext('Pool'), - allowBlank: false + allowBlank: false, }); } else { me.column1.push({ @@ -131,7 +131,7 @@ Ext.define('PVE.storage.RBDInputPanel', { nodename: me.nodename, name: 'pool', fieldLabel: gettext('Pool'), - allowBlank: false + allowBlank: false, }); } @@ -143,33 +143,33 @@ Ext.define('PVE.storage.RBDInputPanel', { bind: { disabled: '{pveceph}', submitValue: '{!pveceph}', - hidden: '{pveceph}' + hidden: '{pveceph}', }, value: '', fieldLabel: 'Monitor(s)', - allowBlank: false + allowBlank: false, }, { xtype: 'displayfield', reference: 'monhost', bind: { disabled: '{!pveceph}', - hidden: '{!pveceph}' + hidden: '{!pveceph}', }, value: '', - fieldLabel: 'Monitor(s)' + fieldLabel: 'Monitor(s)', }, { xtype: me.isCreate ? 'textfield' : 'displayfield', name: 'username', bind: { disabled: '{pveceph}', - submitValue: '{!pveceph}' + submitValue: '{!pveceph}', }, value: 'admin', fieldLabel: gettext('User name'), - allowBlank: true - } + allowBlank: true, + }, ); me.column2 = [ @@ -180,14 +180,14 @@ Ext.define('PVE.storage.RBDInputPanel', { name: 'content', value: ['images'], multiSelect: true, - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxcheckbox', name: 'krbd', uncheckedValue: 0, - fieldLabel: 'KRBD' - } + fieldLabel: 'KRBD', + }, ]; me.columnB = [{ @@ -196,15 +196,15 @@ Ext.define('PVE.storage.RBDInputPanel', { reference: 'pvecephRef', bind : { disabled: '{!pvecephPossible}', - value: '{pveceph}' + value: '{pveceph}', }, checked: true, uncheckedValue: 0, submitValue: false, hidden: !me.isCreate, - boxLabel: gettext('Use Proxmox VE managed hyper-converged ceph pool') + boxLabel: gettext('Use Proxmox VE managed hyper-converged ceph pool'), }]; me.callParent(); - } + }, }); diff --git a/www/manager6/storage/StatusView.js b/www/manager6/storage/StatusView.js index 8fcc789d..e42e8a7d 100644 --- a/www/manager6/storage/StatusView.js +++ b/www/manager6/storage/StatusView.js @@ -7,59 +7,59 @@ Ext.define('PVE.storage.StatusView', { layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, defaults: { xtype: 'pveInfoWidget', - padding: '0 30 5 30' + padding: '0 30 5 30', }, items: [ { xtype: 'box', - height: 30 + height: 30, }, { itemId: 'enabled', title: gettext('Enabled'), printBar: false, textField: 'disabled', - renderer: Proxmox.Utils.format_neg_boolean + renderer: Proxmox.Utils.format_neg_boolean, }, { itemId: 'active', title: gettext('Active'), printBar: false, textField: 'active', - renderer: Proxmox.Utils.format_boolean + renderer: Proxmox.Utils.format_boolean, }, { itemId: 'content', title: gettext('Content'), printBar: false, textField: 'content', - renderer: PVE.Utils.format_content_types + renderer: PVE.Utils.format_content_types, }, { itemId: 'type', title: gettext('Type'), printBar: false, textField: 'type', - renderer: PVE.Utils.format_storage_type + renderer: PVE.Utils.format_storage_type, }, { xtype: 'box', - height: 10 + height: 10, }, { itemId: 'usage', title: gettext('Usage'), valueField: 'used', - maxField: 'total' - } + maxField: 'total', + }, ], updateTitle: function() { return; - } + }, }); diff --git a/www/manager6/storage/Summary.js b/www/manager6/storage/Summary.js index 5867c7f3..f131d3ce 100644 --- a/www/manager6/storage/Summary.js +++ b/www/manager6/storage/Summary.js @@ -6,15 +6,15 @@ Ext.define('PVE.storage.Summary', { tbar: [ '->', { - xtype: 'proxmoxRRDTypeSelector' - } + xtype: 'proxmoxRRDTypeSelector', + }, ], layout: { - type: 'column' + type: 'column', }, defaults: { padding: 5, - columnWidth: 1 + columnWidth: 1, }, initComponent: function() { var me = this; @@ -31,12 +31,12 @@ Ext.define('PVE.storage.Summary', { var rstore = Ext.create('Proxmox.data.ObjectStore', { url: "/api2/json/nodes/" + nodename + "/storage/" + storage + "/status", - interval: 1000 + interval: 1000, }); var rrdstore = Ext.create('Proxmox.data.RRDStore', { rrdurl: "/api2/json/nodes/" + nodename + "/storage/" + storage + "/rrddata", - model: 'pve-rrd-storage' + model: 'pve-rrd-storage', }); Ext.apply(me, { @@ -44,22 +44,22 @@ Ext.define('PVE.storage.Summary', { { xtype: 'pveStorageStatusView', pveSelNode: me.pveSelNode, - rstore: rstore + rstore: rstore, }, { xtype: 'proxmoxRRDChart', title: gettext('Usage'), - fields: ['total','used'], + fields: ['total', 'used'], fieldTitles: ['Total Size', 'Used Size'], - store: rrdstore - } + store: rrdstore, + }, ], listeners: { activate: function() { rstore.startUpdate(); rrdstore.startUpdate(); }, - destroy: function() { rstore.stopUpdate(); rrdstore.stopUpdate(); } - } + destroy: function() { rstore.stopUpdate(); rrdstore.stopUpdate(); }, + }, }); me.callParent(); - } + }, }); diff --git a/www/manager6/storage/TemplateView.js b/www/manager6/storage/TemplateView.js index f7b5efe8..f79af9a9 100644 --- a/www/manager6/storage/TemplateView.js +++ b/www/manager6/storage/TemplateView.js @@ -6,7 +6,7 @@ Ext.define('PVE.grid.TemplateSelector', { stateful: true, stateId: 'grid-template-selector', viewConfig: { - trackOver: false + trackOver: false, }, initComponent : function() { var me = this; @@ -21,14 +21,14 @@ Ext.define('PVE.grid.TemplateSelector', { groupField: 'section', proxy: { type: 'proxmox', - url: '/api2/json' + baseurl - } + url: '/api2/json' + baseurl, + }, }); var sm = Ext.create('Ext.selection.RowModel', {}); - var groupingFeature = Ext.create('Ext.grid.feature.Grouping',{ - groupHeaderTpl: '{[ "Section: " + values.name ]} ({rows.length} Item{[values.rows.length > 1 ? "s" : ""]})' + var groupingFeature = Ext.create('Ext.grid.feature.Grouping', { + groupHeaderTpl: '{[ "Section: " + values.name ]} ({rows.length} Item{[values.rows.length > 1 ? "s" : ""]})', }); var reload = function() { @@ -56,41 +56,41 @@ Ext.define('PVE.grid.TemplateSelector', { return (rec.data['package'].toLowerCase().indexOf(value) !== -1) || (rec.data.headline.toLowerCase().indexOf(value) !== -1); }); - } - } - } + }, + }, + }, ], features: [ groupingFeature ], columns: [ { header: gettext('Type'), width: 80, - dataIndex: 'type' + dataIndex: 'type', }, { header: gettext('Package'), flex: 1, - dataIndex: 'package' + dataIndex: 'package', }, { header: gettext('Version'), width: 80, - dataIndex: 'version' + dataIndex: 'version', }, { header: gettext('Description'), flex: 1.5, renderer: Ext.String.htmlEncode, - dataIndex: 'headline' - } + dataIndex: 'headline', + }, ], listeners: { - afterRender: reload - } + afterRender: reload, + }, }); me.callParent(); - } + }, }, function() { @@ -98,9 +98,9 @@ Ext.define('PVE.grid.TemplateSelector', { extend: 'Ext.data.Model', fields: [ 'template', 'type', 'package', 'version', 'headline', 'infopage', - 'description', 'os', 'section' + 'description', 'os', 'section', ], - idProperty: 'template' + idProperty: 'template', }); }); @@ -120,7 +120,7 @@ Ext.define('PVE.storage.TemplateDownload', { var grid = Ext.create('PVE.grid.TemplateSelector', { border: false, scrollable: true, - nodename: me.nodename + nodename: me.nodename, }); var sm = grid.getSelectionModel(); @@ -134,7 +134,7 @@ Ext.define('PVE.storage.TemplateDownload', { url: '/nodes/' + me.nodename + '/aplinfo', params: { storage: me.storage, - template: rec.data.template + template: rec.data.template, }, method: 'POST', failure: function (response, opts) { @@ -146,23 +146,23 @@ Ext.define('PVE.storage.TemplateDownload', { Ext.create('Proxmox.window.TaskViewer', { upid: upid, listeners: { - destroy: me.reloadGrid - } + destroy: me.reloadGrid, + }, }).show(); me.close(); - } + }, }); - } + }, }); Ext.apply(me, { items: grid, - buttons: [ submitBtn ] + buttons: [ submitBtn ], }); me.callParent(); - } + }, }); Ext.define('PVE.storage.TemplateView', { @@ -191,17 +191,17 @@ Ext.define('PVE.storage.TemplateView', { me.store.load(); } - var templateButton = Ext.create('Proxmox.button.Button',{ + var templateButton = Ext.create('Proxmox.button.Button', { itemId: 'tmpl-btn', text: gettext('Templates'), handler: function() { var win = Ext.create('PVE.storage.TemplateDownload', { nodename: nodename, storage: storage, - reloadGrid: reload + reloadGrid: reload, }); win.show(); - } + }, }); me.tbar = [ templateButton ]; diff --git a/www/manager6/storage/ZFSEdit.js b/www/manager6/storage/ZFSEdit.js index 77167c3d..54be7e98 100644 --- a/www/manager6/storage/ZFSEdit.js +++ b/www/manager6/storage/ZFSEdit.js @@ -6,23 +6,23 @@ Ext.define('PVE.storage.ZFSInputPanel', { data: { isLIO: false, isComstar: true, - hasWriteCacheOption: true - } + hasWriteCacheOption: true, + }, }, controller: { xclass: 'Ext.app.ViewController', control: { 'field[name=iscsiprovider]': { - change: 'changeISCSIProvider' - } + change: 'changeISCSIProvider', + }, }, changeISCSIProvider: function(f, newVal, oldVal) { var vm = this.getViewModel(); vm.set('isLIO', newVal === 'LIO'); vm.set('isComstar', newVal === 'comstar'); vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt'); - } + }, }, onGetValues: function(values) { @@ -52,28 +52,28 @@ Ext.define('PVE.storage.ZFSInputPanel', { name: 'portal', value: '', fieldLabel: gettext('Portal'), - allowBlank: false + allowBlank: false, }, { xtype: me.isCreate ? 'textfield' : 'displayfield', name: 'pool', value: '', fieldLabel: gettext('Pool'), - allowBlank: false + allowBlank: false, }, { xtype: me.isCreate ? 'textfield' : 'displayfield', name: 'blocksize', value: '4k', fieldLabel: gettext('Block Size'), - allowBlank: false + allowBlank: false, }, { xtype: me.isCreate ? 'textfield' : 'displayfield', name: 'target', value: '', fieldLabel: gettext('Target'), - allowBlank: false + allowBlank: false, }, { xtype: me.isCreate ? 'textfield' : 'displayfield', @@ -81,8 +81,8 @@ Ext.define('PVE.storage.ZFSInputPanel', { value: '', fieldLabel: gettext('Target group'), bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' }, - allowBlank: true - } + allowBlank: true, + }, ]; me.column2 = [ @@ -91,14 +91,14 @@ Ext.define('PVE.storage.ZFSInputPanel', { name: 'iscsiprovider', value: 'comstar', fieldLabel: gettext('iSCSI Provider'), - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxcheckbox', name: 'sparse', checked: false, uncheckedValue: 0, - fieldLabel: gettext('Thin provision') + fieldLabel: gettext('Thin provision'), }, { xtype: 'proxmoxcheckbox', @@ -106,7 +106,7 @@ Ext.define('PVE.storage.ZFSInputPanel', { checked: true, bind: me.isCreate ? { disabled: '{!hasWriteCacheOption}' } : { hidden: '{!hasWriteCacheOption}' }, uncheckedValue: 0, - fieldLabel: gettext('Write cache') + fieldLabel: gettext('Write cache'), }, { xtype: me.isCreate ? 'textfield' : 'displayfield', @@ -114,7 +114,7 @@ Ext.define('PVE.storage.ZFSInputPanel', { value: '', bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' }, fieldLabel: gettext('Host group'), - allowBlank: true + allowBlank: true, }, { xtype: me.isCreate ? 'textfield' : 'displayfield', @@ -122,10 +122,10 @@ Ext.define('PVE.storage.ZFSInputPanel', { value: '', bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' }, allowBlank: false, - fieldLabel: gettext('Target portal group') - } + fieldLabel: gettext('Target portal group'), + }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/storage/ZFSPoolEdit.js b/www/manager6/storage/ZFSPoolEdit.js index 3c16595a..a5c41270 100644 --- a/www/manager6/storage/ZFSPoolEdit.js +++ b/www/manager6/storage/ZFSPoolEdit.js @@ -6,7 +6,7 @@ Ext.define('PVE.storage.ZFSPoolSelector', { queryMode: 'local', editable: false, listConfig: { - loadingText: gettext('Scanning...') + loadingText: gettext('Scanning...'), }, initComponent : function() { var me = this; @@ -20,18 +20,18 @@ Ext.define('PVE.storage.ZFSPoolSelector', { fields: [ 'pool', 'size', 'free' ], proxy: { type: 'proxmox', - url: '/api2/json/nodes/' + me.nodename + '/scan/zfs' - } + url: '/api2/json/nodes/' + me.nodename + '/scan/zfs', + }, }); store.sort('pool', 'ASC'); Ext.apply(me, { - store: store + store: store, }); me.callParent(); - } + }, }); Ext.define('PVE.storage.ZFSPoolInputPanel', { @@ -48,14 +48,14 @@ Ext.define('PVE.storage.ZFSPoolInputPanel', { me.column1.push(Ext.create('PVE.storage.ZFSPoolSelector', { name: 'pool', fieldLabel: gettext('ZFS Pool'), - allowBlank: false + allowBlank: false, })); } else { me.column1.push(Ext.createWidget('displayfield', { name: 'pool', value: '', fieldLabel: gettext('ZFS Pool'), - allowBlank: false + allowBlank: false, })); } @@ -68,7 +68,7 @@ Ext.define('PVE.storage.ZFSPoolInputPanel', { name: 'content', value: ['images', 'rootdir'], multiSelect: true, - allowBlank: false + allowBlank: false, }); me.column2 = [ { @@ -76,17 +76,17 @@ Ext.define('PVE.storage.ZFSPoolInputPanel', { name: 'sparse', checked: false, uncheckedValue: 0, - fieldLabel: gettext('Thin provision') + fieldLabel: gettext('Thin provision'), }, { xtype: 'textfield', name: 'blocksize', emptyText: '8k', fieldLabel: gettext('Block Size'), - allowBlank: true - } + allowBlank: true, + }, ]; me.callParent(); - } + }, }); diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js index 317d17df..befd0d4c 100644 --- a/www/manager6/tree/ResourceTree.js +++ b/www/manager6/tree/ResourceTree.js @@ -9,33 +9,33 @@ Ext.define('PVE.tree.ResourceTree', { typeDefaults: { node: { iconCls: 'fa fa-building', - text: gettext('Nodes') + text: gettext('Nodes'), }, pool: { iconCls: 'fa fa-tags', - text: gettext('Resource Pool') + text: gettext('Resource Pool'), }, storage: { iconCls: 'fa fa-database', - text: gettext('Storage') + text: gettext('Storage'), }, sdn: { iconCls: 'fa fa-th', - text: gettext('SDN') + text: gettext('SDN'), }, qemu: { iconCls: 'fa fa-desktop', - text: gettext('Virtual Machine') + text: gettext('Virtual Machine'), }, lxc: { //iconCls: 'x-tree-node-lxc', iconCls: 'fa fa-cube', - text: gettext('LXC Container') + text: gettext('LXC Container'), }, template: { - iconCls: 'fa fa-file-o' - } - } + iconCls: 'fa fa-file-o', + }, + }, }, useArrows: true, @@ -198,7 +198,7 @@ Ext.define('PVE.tree.ResourceTree', { } else { groupinfo = { type: groupby, - id : groupby + "/" + v + id : groupby + "/" + v, }; if (groupby !== 'type') { groupinfo[groupby] = v; @@ -231,7 +231,7 @@ Ext.define('PVE.tree.ResourceTree', { var pdata = { dataIndex: {}, - updateCount: 0 + updateCount: 0, }; var store = Ext.create('Ext.data.TreeStore', { @@ -240,8 +240,8 @@ Ext.define('PVE.tree.ResourceTree', { expanded: true, id: 'root', text: gettext('Datacenter'), - iconCls: 'fa fa-server' - } + iconCls: 'fa fa-server', + }, }); var stateid = 'rid'; @@ -305,7 +305,7 @@ Ext.define('PVE.tree.ResourceTree', { // tree item has been updated var fields = [ 'text', 'running', 'template', 'status', - 'qmpstatus', 'hastate', 'lock' + 'qmpstatus', 'hastate', 'lock', ]; var field; @@ -409,7 +409,7 @@ Ext.define('PVE.tree.ResourceTree', { store: store, viewConfig: { // note: animate cause problems with applyState - animate: false + animate: false, }, //useArrows: true, //rootVisible: false, @@ -430,7 +430,7 @@ Ext.define('PVE.tree.ResourceTree', { me.allowSelection = true; return allow; }, - itemdblclick: PVE.Utils.openTreeConsole + itemdblclick: PVE.Utils.openTreeConsole, }, setViewFilter: function(view) { me.viewFilter = view; @@ -491,7 +491,7 @@ Ext.define('PVE.tree.ResourceTree', { } else { sm.deselectAll(); } - } + }, }); me.callParent(); @@ -504,6 +504,6 @@ Ext.define('PVE.tree.ResourceTree', { rstore.on("load", updateTree); rstore.startUpdate(); //rstore.stopUpdate(); - } + }, }); diff --git a/www/manager6/tree/SnapshotTree.js b/www/manager6/tree/SnapshotTree.js index 75aa370b..d64eabb9 100644 --- a/www/manager6/tree/SnapshotTree.js +++ b/www/manager6/tree/SnapshotTree.js @@ -86,7 +86,7 @@ Ext.define('PVE.guest.SnapshotTree', { var upid = response.result.data; var win = Ext.create('Proxmox.window.TaskProgress', { upid: upid }); win.show(); - } + }, }); }, @@ -159,7 +159,7 @@ Ext.define('PVE.guest.SnapshotTree', { } me.load_task.delay(load_delay); - } + }, }); // if we do not have the permissions, we don't have to check @@ -180,7 +180,7 @@ Ext.define('PVE.guest.SnapshotTree', { } let res = response.result.data; vm.set('snapshotFeature', !!res.hasFeature); - } + }, }); }, @@ -289,7 +289,7 @@ Ext.define('PVE.guest.SnapshotTree', { let rec = view.getSelection()[0]; return Ext.String.format( gettext('Are you sure you want to remove entry {0}'), - `'${rec.data.name}'` + `'${rec.data.name}'`, ); }, handler: 'remove', @@ -313,8 +313,8 @@ Ext.define('PVE.guest.SnapshotTree', { name: 'order', calculate: function(data) { return data.snaptime || (data.name === 'current' ? 'ZZZ' : data.snapstate); - } - } + }, + }, ], columns: [ @@ -329,7 +329,7 @@ Ext.define('PVE.guest.SnapshotTree', { } else { return value; } - } + }, }, { text: gettext('RAM'), @@ -345,7 +345,7 @@ Ext.define('PVE.guest.SnapshotTree', { if (record.data.name !== 'current') { return Proxmox.Utils.format_boolean(value); } - } + }, }, { text: gettext('Date') + "/" + gettext("Status"), @@ -356,9 +356,9 @@ Ext.define('PVE.guest.SnapshotTree', { return record.data.snapstate; } if (value) { - return Ext.Date.format(value,'Y-m-d H:i:s'); + return Ext.Date.format(value, 'Y-m-d H:i:s'); } - } + }, }, { text: gettext('Description'), @@ -370,8 +370,8 @@ Ext.define('PVE.guest.SnapshotTree', { } else { return Ext.String.htmlEncode(value); } - } - } + }, + }, ], }); diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js index 40c3c157..4cc41f98 100644 --- a/www/manager6/window/Backup.js +++ b/www/manager6/window/Backup.js @@ -41,7 +41,7 @@ Ext.define('PVE.window.Backup', { } else if (!compressionSelector.getEditable()) { compressionSelector.setDisabled(false); } - } + }, }, }); storagesel.setValue(me.storage); @@ -51,7 +51,7 @@ Ext.define('PVE.window.Backup', { border: false, fieldDefaults: { labelWidth: 100, - anchor: '100%' + anchor: '100%', }, items: [ storagesel, @@ -59,16 +59,16 @@ Ext.define('PVE.window.Backup', { xtype: 'pveBackupModeSelector', fieldLabel: gettext('Mode'), value: 'snapshot', - name: 'mode' + name: 'mode', }, compressionSelector, { xtype: 'textfield', fieldLabel: gettext('Send email to'), name: 'mailto', - emptyText: Proxmox.Utils.noneText - } - ] + emptyText: Proxmox.Utils.noneText, + }, + ], }); var form = me.formPanel.getForm(); @@ -82,7 +82,7 @@ Ext.define('PVE.window.Backup', { storage: storage, vmid: me.vmid, mode: values.mode, - remove: 0 + remove: 0, }; if ( values.mailto ) { @@ -98,7 +98,7 @@ Ext.define('PVE.window.Backup', { params: params, method: 'POST', failure: function (response, opts) { - Ext.Msg.alert('Error',response.htmlStatus); + Ext.Msg.alert('Error', response.htmlStatus); }, success: function(response, options) { // close later so we reload the grid @@ -112,19 +112,19 @@ Ext.define('PVE.window.Backup', { listeners: { close: function() { me.close(); - } - } + }, + }, }); win.show(); - } + }, }); - } + }, }); var helpBtn = Ext.create('Proxmox.button.Help', { onlineHelp: 'chapter_vzdump', listenToGlobalEvent: false, - hidden: false + hidden: false, }); var title = gettext('Backup') + " " + @@ -138,9 +138,9 @@ Ext.define('PVE.window.Backup', { layout: 'auto', border: false, items: [ me.formPanel ], - buttons: [ helpBtn, '->', submitBtn ] + buttons: [ helpBtn, '->', submitBtn ], }); me.callParent(); - } + }, }); diff --git a/www/manager6/window/BackupConfig.js b/www/manager6/window/BackupConfig.js index cf0a93fa..ca61b1e4 100644 --- a/www/manager6/window/BackupConfig.js +++ b/www/manager6/window/BackupConfig.js @@ -13,8 +13,8 @@ Ext.define('PVE.window.BackupConfig', { 'background-color': 'white', 'white-space': 'pre', 'font-family': 'monospace', - padding: '5px' - } + padding: '5px', + }, }, initComponent: function() { @@ -35,16 +35,16 @@ Ext.define('PVE.window.BackupConfig', { url: "/nodes/" + nodename + "/vzdump/extractconfig", method: 'GET', params: { - volume: me.volume + volume: me.volume, }, failure: function(response, opts) { me.close(); Ext.Msg.alert('Error', response.htmlStatus); }, - success: function(response,options) { + success: function(response, options) { me.show(); me.down('#configtext').update(Ext.htmlEncode(response.result.data)); - } + }, }); - } + }, }); diff --git a/www/manager6/window/BulkAction.js b/www/manager6/window/BulkAction.js index 8d5a8743..a2005b56 100644 --- a/www/manager6/window/BulkAction.js +++ b/www/manager6/window/BulkAction.js @@ -5,7 +5,7 @@ Ext.define('PVE.window.BulkAction', { width: 800, modal: true, layout: { - type: 'fit' + type: 'fit', }, border: false, @@ -31,14 +31,14 @@ Ext.define('PVE.window.BulkAction', { var upid = response.result.data; var win = Ext.create('Proxmox.window.TaskViewer', { - upid: upid + upid: upid, }); win.show(); me.hide(); win.on('destroy', function() { me.close(); }); - } + }, }); }, @@ -69,7 +69,7 @@ Ext.define('PVE.window.BulkAction', { disallowedNodes: [me.nodename], fieldLabel: gettext('Target node'), allowBlank: false, - onlineValidator: true + onlineValidator: true, }, { xtype: 'proxmoxintegerfield', @@ -78,7 +78,7 @@ Ext.define('PVE.window.BulkAction', { maxValue: 100, value: 1, fieldLabel: gettext('Parallel jobs'), - allowBlank: false + allowBlank: false, }, { xtype: 'fieldcontainer', @@ -91,7 +91,7 @@ Ext.define('PVE.window.BulkAction', { uncheckedValue: 0, listeners: { change: (cb, val) => me.down('#localdiskwarning').setVisible(val), - } + }, }, { @@ -108,14 +108,14 @@ Ext.define('PVE.window.BulkAction', { xtype: 'displayfield', userCls: 'pmx-hint', value: 'Warning: Running CTs will be migrated in Restart Mode.', - hidden: true // only visible if running container chosen - } + hidden: true, // only visible if running container chosen + }, ); } else if (me.action === 'startall') { items.push({ xtype: 'hiddenfield', name: 'force', - value: 1 + value: 1, }); } @@ -138,8 +138,8 @@ Ext.define('PVE.window.BulkAction', { }); me.down('#lxcwarning').setVisible(showWarning); } - } - } + }, + }, }); me.formPanel = Ext.create('Ext.form.Panel', { @@ -147,13 +147,13 @@ Ext.define('PVE.window.BulkAction', { border: false, layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, fieldDefaults: { labelWidth: 300, - anchor: '100%' + anchor: '100%', }, - items: items + items: items, }); var form = me.formPanel.getForm(); @@ -163,12 +163,12 @@ Ext.define('PVE.window.BulkAction', { handler: function() { form.isValid(); me.submit(form.getValues()); - } + }, }); Ext.apply(me, { items: [ me.formPanel ], - buttons: [ submitBtn ] + buttons: [ submitBtn ], }); me.callParent(); @@ -178,5 +178,5 @@ Ext.define('PVE.window.BulkAction', { submitBtn.setDisabled(!valid); }); form.isValid(); - } + }, }); diff --git a/www/manager6/window/CephInstall.js b/www/manager6/window/CephInstall.js index 61475d85..2f8e64f2 100644 --- a/www/manager6/window/CephInstall.js +++ b/www/manager6/window/CephInstall.js @@ -18,11 +18,11 @@ Ext.define('PVE.ceph.Install', { layout: { align: 'stretch', pack: 'center', - type: 'vbox' + type: 'vbox', }, viewModel: { data: { - isInstalled: false + isInstalled: false, }, formulas: { buttonText: function (get){ @@ -42,41 +42,41 @@ Ext.define('PVE.ceph.Install', { Ext.String.format(gettext('{0} is not installed on this node.'), 'Ceph') + '
' + gettext('Would you like to install it now?') + '

'; } - } - } + }, + }, }, items: [ { bind: { - html: '{windowText}' + html: '{windowText}', }, border: false, padding: 5, - bodyCls: 'install-mask' + bodyCls: 'install-mask', }, { xtype: 'button', bind: { - text: '{buttonText}' + text: '{buttonText}', }, viewModel: {}, cbind: { - nodename: '{nodename}' + nodename: '{nodename}', }, handler: function() { var me = this.up('pveCephInstallWindow'); - var win = Ext.create('PVE.ceph.CephInstallWizard',{ - nodename: me.nodename + var win = Ext.create('PVE.ceph.CephInstallWizard', { + nodename: me.nodename, }); win.getViewModel().set('isInstalled', this.getViewModel().get('isInstalled')); win.show(); - me.mon(win,'beforeClose', function(){ + me.mon(win, 'beforeClose', function(){ me.fireEvent("cephInstallWindowClosed"); me.close(); }); - } - } - ] + }, + }, + ], }); diff --git a/www/manager6/window/Clone.js b/www/manager6/window/Clone.js index 95ab1cd7..3a69ec30 100644 --- a/www/manager6/window/Clone.js +++ b/www/manager6/window/Clone.js @@ -11,12 +11,12 @@ Ext.define('PVE.window.Clone', { xclass: 'Ext.app.ViewController', control: { 'panel[reference=cloneform]': { - validitychange: 'disableSubmit' - } + validitychange: 'disableSubmit', + }, }, disableSubmit: function(form) { this.lookupReference('submitBtn').setDisabled(!form.isValid()); - } + }, }, statics: { @@ -37,11 +37,11 @@ Ext.define('PVE.window.Clone', { guestType: guestType, vmid: vmid, isTemplate: isTemplate, - hasSnapshots: hasSnapshots + hasSnapshots: hasSnapshots, }).show(); - } + }, }); - } + }, }, create_clone: function(values) { @@ -89,7 +89,7 @@ Ext.define('PVE.window.Clone', { }, success: function(response, options) { me.close(); - } + }, }); }, @@ -129,7 +129,7 @@ Ext.define('PVE.window.Clone', { me.lookupReference('targetsel').allowedNodes = res.nodes; me.lookupReference('targetsel').validate(); - } + }, }); }, @@ -172,8 +172,8 @@ Ext.define('PVE.window.Clone', { listeners: { change: function(f, value) { me.lookupReference('hdstorage').setTargetNode(value); - } - } + }, + }, }); var modelist = [['copy', gettext('Full Clone')]]; @@ -187,21 +187,21 @@ Ext.define('PVE.window.Clone', { guestType: me.guestType, value: '', loadNextFreeID: true, - validateExists: false + validateExists: false, }, { xtype: 'textfield', name: 'name', allowBlank: true, - fieldLabel: me.guestType === 'lxc' ? gettext('Hostname') : gettext('Name') + fieldLabel: me.guestType === 'lxc' ? gettext('Hostname') : gettext('Name'), }, { xtype: 'pvePoolSelector', fieldLabel: gettext('Resource Pool'), name: 'pool', value: '', - allowBlank: true - } + allowBlank: true, + }, ); col2.push({ @@ -217,8 +217,8 @@ Ext.define('PVE.window.Clone', { change: function(t, value) { me.updateVisibility(); me.verifyFeature(); - } - } + }, + }, }, { xtype: 'PVE.form.SnapshotSelector', @@ -235,8 +235,8 @@ Ext.define('PVE.window.Clone', { listeners: { change: function(f, value) { me.verifyFeature(); - } - } + }, + }, }, { xtype: 'pveDiskStorageSelector', @@ -249,7 +249,7 @@ Ext.define('PVE.window.Clone', { allowBlank: true, storageContent: me.guestType === 'qemu' ? 'images' : 'rootdir', emptyText: gettext('Same as source'), - disabled: me.isTemplate ? true : false // because default mode is clone for templates + disabled: me.isTemplate ? true : false, // because default mode is clone for templates }); var formPanel = Ext.create('Ext.form.Panel', { @@ -260,22 +260,22 @@ Ext.define('PVE.window.Clone', { defaultType: 'container', fieldDefaults: { labelWidth: 100, - anchor: '100%' + anchor: '100%', }, items: [ { flex: 1, padding: '0 10 0 0', layout: 'anchor', - items: col1 + items: col1, }, { flex: 1, padding: '0 0 0 10', layout: 'anchor', - items: col2 - } - ] + items: col2, + }, + ], }); Ext.apply(me, { @@ -288,7 +288,7 @@ Ext.define('PVE.window.Clone', { xtype: 'proxmoxHelpButton', listenToGlobalEvent: false, hidden: false, - onlineHelp: me.onlineHelp + onlineHelp: me.onlineHelp, }, '->', { @@ -300,13 +300,13 @@ Ext.define('PVE.window.Clone', { if (cloneForm.isValid()) { me.create_clone(cloneForm.getValues()); } - } + }, } ], - items: [ formPanel ] + items: [ formPanel ], }); me.callParent(); me.verifyFeature(); - } + }, }); diff --git a/www/manager6/window/FirewallEnableEdit.js b/www/manager6/window/FirewallEnableEdit.js index 689b63c1..34ecadbc 100644 --- a/www/manager6/window/FirewallEnableEdit.js +++ b/www/manager6/window/FirewallEnableEdit.js @@ -5,7 +5,7 @@ Ext.define('PVE.FirewallEnableEdit', { subject: gettext('Firewall'), cbindData: { - defaultValue: 0 + defaultValue: 0, }, width: 350, @@ -16,18 +16,18 @@ Ext.define('PVE.FirewallEnableEdit', { uncheckedValue: 0, cbind: { defaultValue: '{defaultValue}', - checked: '{defaultValue}' + checked: '{defaultValue}', }, deleteDefaultValue: false, - fieldLabel: gettext('Firewall') + fieldLabel: gettext('Firewall'), }, { xtype: 'displayfield', name: 'warning', userCls: 'pmx-hint', value: gettext('Warning: Firewall still disabled at datacenter level!'), - hidden: true - } + hidden: true, + }, ], beforeShow: function() { @@ -43,7 +43,7 @@ Ext.define('PVE.FirewallEnableEdit', { if (!response.result.data.enable) { me.down('displayfield[name=warning]').setVisible(true); } - } + }, }); - } + }, }); diff --git a/www/manager6/window/FirewallLograteEdit.js b/www/manager6/window/FirewallLograteEdit.js index 164c84a5..2d1a83d2 100644 --- a/www/manager6/window/FirewallLograteEdit.js +++ b/www/manager6/window/FirewallLograteEdit.js @@ -10,7 +10,7 @@ Ext.define('PVE.FirewallLograteInputPanel', { name: 'enable', reference: 'enable', fieldLabel: gettext('Enable'), - value: true + value: true, }, { layout: 'hbox', @@ -24,11 +24,11 @@ Ext.define('PVE.FirewallLograteInputPanel', { maxValue: 99, allowBlank: false, flex: 2, - value: 1 + value: 1, }, { xtype: 'box', - html: '
/
' + html: '
/
', }, { xtype: 'proxmoxKVComboBox', @@ -37,9 +37,9 @@ Ext.define('PVE.FirewallLograteInputPanel', { ['hour', 'hour'], ['day', 'day']], allowBlank: false, flex: 1, - value: 'second' - } - ] + value: 'second', + }, + ], }, { xtype: 'numberfield', @@ -47,8 +47,8 @@ Ext.define('PVE.FirewallLograteInputPanel', { fieldLabel: gettext('Log burst limit'), minValue: 1, maxValue: 99, - value: 5 - } + value: 5, + }, ], onGetValues: function(values) { @@ -80,7 +80,7 @@ Ext.define('PVE.FirewallLograteInputPanel', { } } me.callParent([properties]); - } + }, }); Ext.define('PVE.FirewallLograteEdit', { @@ -90,7 +90,7 @@ Ext.define('PVE.FirewallLograteEdit', { subject: gettext('Log rate limit'), items: [{ - xtype: 'pveFirewallLograteInputPanel' + xtype: 'pveFirewallLograteInputPanel', }], - autoLoad: true + autoLoad: true, }); diff --git a/www/manager6/window/LoginWindow.js b/www/manager6/window/LoginWindow.js index 6123c655..76ea36bc 100644 --- a/www/manager6/window/LoginWindow.js +++ b/www/manager6/window/LoginWindow.js @@ -50,7 +50,7 @@ Ext.define('PVE.window.LoginWindow', { } else { me.success(data); } - } + }, }); }, @@ -89,7 +89,7 @@ Ext.define('PVE.window.LoginWindow', { Proxmox.LoggedOut = false; Proxmox.Utils.authClear(); me.getView().show(); - } + }, }); win.show(); }, @@ -100,12 +100,12 @@ Ext.define('PVE.window.LoginWindow', { var msg = Ext.Msg.show({ title: 'U2F: '+gettext('Verification'), message: gettext('Please press the button on your U2F Device'), - buttons: [] + buttons: [], }); var chlg = data.U2FChallenge; var key = { version: chlg.version, - keyHandle: chlg.keyHandle + keyHandle: chlg.keyHandle, }; u2f.sign(chlg.appId, chlg.challenge, [key], function(res) { msg.close(); @@ -140,7 +140,7 @@ Ext.define('PVE.window.LoginWindow', { failure: function(resp, opts) { Proxmox.Utils.authClear(); me.failure(resp); - } + }, }); }, @@ -153,7 +153,7 @@ Ext.define('PVE.window.LoginWindow', { pf.focus(false); } } - } + }, }, 'field[name=lang]': { change: function(f, value) { @@ -161,10 +161,10 @@ Ext.define('PVE.window.LoginWindow', { Ext.util.Cookies.set('PVELangCookie', value, dt); this.getView().mask(gettext('Please wait...'), 'x-mask-loading'); window.location.reload(); - } + }, }, 'button[reference=loginButton]': { - click: 'onLogon' + click: 'onLogon', }, '#': { show: function() { @@ -181,9 +181,9 @@ Ext.define('PVE.window.LoginWindow', { var pwField = this.lookupReference('passwordField'); pwField.focus(); } - } - } - } + }, + }, + }, }, width: 400, @@ -207,7 +207,7 @@ Ext.define('PVE.window.LoginWindow', { fieldDefaults: { labelAlign: 'right', - allowBlank: false + allowBlank: false, }, items: [ @@ -217,18 +217,18 @@ Ext.define('PVE.window.LoginWindow', { name: 'username', itemId: 'usernameField', reference: 'usernameField', - stateId: 'login-username' + stateId: 'login-username', }, { xtype: 'textfield', inputType: 'password', fieldLabel: gettext('Password'), name: 'password', - reference: 'passwordField' + reference: 'passwordField', }, { xtype: 'pmxRealmComboBox', - name: 'realm' + name: 'realm', }, { xtype: 'proxmoxLanguageSelector', @@ -236,8 +236,8 @@ Ext.define('PVE.window.LoginWindow', { value: Ext.util.Cookies.get('PVELangCookie') || Proxmox.defaultLang || 'en', name: 'lang', reference: 'langField', - submitValue: false - } + submitValue: false, + }, ], buttons: [ { @@ -248,14 +248,14 @@ Ext.define('PVE.window.LoginWindow', { stateId: 'login-saveusername', labelWidth: 250, labelAlign: 'right', - submitValue: false + submitValue: false, }, { text: gettext('Login'), - reference: 'loginButton' - } - ] - }] + reference: 'loginButton', + }, + ], + }], }); Ext.define('PVE.window.TFALoginWindow', { extend: 'Ext.window.Window', @@ -280,7 +280,7 @@ Ext.define('PVE.window.TFALoginWindow', { var view = me.getView(); view.onCancel(); view.close(); - } + }, }, items: [ @@ -290,19 +290,19 @@ Ext.define('PVE.window.TFALoginWindow', { name: 'otp', itemId: 'otpField', reference: 'otpField', - allowBlank: false - } + allowBlank: false, + }, ], buttons: [ { text: gettext('Login'), reference: 'loginButton', - handler: 'login' + handler: 'login', }, { text: gettext('Cancel'), - handler: 'cancel' - } - ] + handler: 'cancel', + }, + ], }); diff --git a/www/manager6/window/Migrate.js b/www/manager6/window/Migrate.js index 91d1b30b..8f26c27d 100644 --- a/www/manager6/window/Migrate.js +++ b/www/manager6/window/Migrate.js @@ -14,11 +14,11 @@ Ext.define('PVE.window.Migrate', { running: false, qemu: { onlineHelp: 'qm_migration', - commonName: 'VM' + commonName: 'VM', }, lxc: { onlineHelp: 'pct_migration', - commonName: 'CT' + commonName: 'CT', }, migration: { possible: true, @@ -27,8 +27,8 @@ Ext.define('PVE.window.Migrate', { mode: undefined, allowedNodes: undefined, overwriteLocalResourceCheck: false, - hasLocalResources: false - } + hasLocalResources: false, + }, }, @@ -58,8 +58,8 @@ Ext.define('PVE.window.Migrate', { } else { return false; } - } - } + }, + }, }, controller: { @@ -69,8 +69,8 @@ Ext.define('PVE.window.Migrate', { validityChange: function(panel, isValid) { this.getViewModel().set('migration.possible', isValid); this.checkMigratePreconditions(); - } - } + }, + }, }, init: function(view) { @@ -94,10 +94,10 @@ Ext.define('PVE.window.Migrate', { view.setTitle( - Ext.String.format('{0} {1} {2}', gettext('Migrate'), vm.get(view.vmtype).commonName, view.vmid) + Ext.String.format('{0} {1} {2}', gettext('Migrate'), vm.get(view.vmtype).commonName, view.vmid), ); me.lookup('proxmoxHelpButton').setHelpConfig({ - onlineHelp: vm.get(view.vmtype).onlineHelp + onlineHelp: vm.get(view.vmtype).onlineHelp, }); me.checkMigratePreconditions(); me.lookup('formPanel').isValid(); @@ -117,7 +117,7 @@ Ext.define('PVE.window.Migrate', { var values = me.lookup('formPanel').getValues(); var params = { - target: values.target + target: values.target, }; if (vm.get('migration.mode')) { @@ -150,11 +150,11 @@ Ext.define('PVE.window.Migrate', { Ext.create('Proxmox.window.TaskViewer', { upid: upid, - extraTitle: extraTitle + extraTitle: extraTitle, }).show(); view.close(); - } + }, }); }, @@ -221,7 +221,7 @@ Ext.define('PVE.window.Migrate', { migration.preconditions.push({ text: 'Storage (' + missing_storages + ') not available on selected target. ' + 'Start VM to use live storage migration or select other target node', - severity: 'error' + severity: 'error', }); } } @@ -233,14 +233,14 @@ Ext.define('PVE.window.Migrate', { migration.preconditions.push({ text: Ext.String.format('Can\'t migrate VM with local resources: {0}', migrateStats.local_resources.join(', ')), - severity: 'error' + severity: 'error', }); } else { migration.preconditions.push({ text: Ext.String.format('Migrate VM with local resources: {0}. ' + 'This might fail if resources aren\'t available on the target node.', migrateStats.local_resources.join(', ')), - severity: 'warning' + severity: 'warning', }); } } @@ -254,7 +254,7 @@ Ext.define('PVE.window.Migrate', { migration.possible = false; migration.preconditions.push({ text: "Can't live migrate VM with local cloudinit disk, use shared storage instead", - severity: 'error' + severity: 'error', }); } else { return; @@ -263,7 +263,7 @@ Ext.define('PVE.window.Migrate', { migration.possible = false; migration.preconditions.push({ text: "Can't migrate VM with local CD/DVD", - severity: 'error' + severity: 'error', }); } } else { @@ -272,7 +272,7 @@ Ext.define('PVE.window.Migrate', { migration.preconditions.push({ text: Ext.String.format('Migration with local disk might take long: {0} {1}', disk.volid, size_string), - severity: 'warning' + severity: 'warning', }); } }); @@ -281,7 +281,7 @@ Ext.define('PVE.window.Migrate', { vm.set('migration', migration); - } + }, }); }, checkLxcPreconditions: function(resetMigrationPossible) { @@ -290,7 +290,7 @@ Ext.define('PVE.window.Migrate', { if (vm.get('running')) { vm.set('migration.mode', 'restart'); } - } + }, }, @@ -299,7 +299,7 @@ Ext.define('PVE.window.Migrate', { modal: true, layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, border: false, items: [ @@ -318,17 +318,17 @@ Ext.define('PVE.window.Migrate', { name: 'source', fieldLabel: gettext('Source node'), bind: { - value: '{nodename}' - } + value: '{nodename}', + }, }, { xtype: 'displayfield', reference: 'migrationMode', fieldLabel: gettext('Mode'), bind: { - value: '{setMigrationMode}' - } - }] + value: '{setMigrationMode}', + }, + }], }, { xtype: 'container', @@ -342,8 +342,8 @@ Ext.define('PVE.window.Migrate', { disallowedNodes: undefined, onlineValidator: true, listeners: { - change: 'onTargetChange' - } + change: 'onTargetChange', + }, }, { xtype: 'pveStorageSelector', @@ -355,8 +355,8 @@ Ext.define('PVE.window.Migrate', { autoSelect: false, emptyText: gettext('Current layout'), bind: { - hidden: '{setStorageselectorHidden}' - } + hidden: '{setStorageselectorHidden}', + }, }, { xtype: 'proxmoxcheckbox', @@ -364,18 +364,18 @@ Ext.define('PVE.window.Migrate', { fieldLabel: gettext('Force'), autoEl: { tag: 'div', - 'data-qtip': 'Overwrite local resources unavailable check' + 'data-qtip': 'Overwrite local resources unavailable check', }, bind: { hidden: '{setLocalResourceCheckboxHidden}', - value: '{migration.overwriteLocalResourceCheck}' + value: '{migration.overwriteLocalResourceCheck}', }, listeners: { - change: {fn: 'checkMigratePreconditions', extraArg: true} - } - }] - } - ] + change: {fn: 'checkMigratePreconditions', extraArg: true}, + }, + }], + }, + ], }, { xtype: 'gridpanel', @@ -395,13 +395,13 @@ Ext.define('PVE.window.Migrate', { return v; } }, - width: 35 + width: 35, }, { text: 'Info', dataIndex: 'text', cellWrap: true, - flex: 1 + flex: 1, }], bind: { hidden: '{!migration.preconditions.length}', @@ -409,9 +409,9 @@ Ext.define('PVE.window.Migrate', { fields: ['severity', 'text'], data: '{migration.preconditions}', sorters: 'text', - } - } - } + }, + }, + }, ], buttons: [ @@ -420,7 +420,7 @@ Ext.define('PVE.window.Migrate', { reference: 'proxmoxHelpButton', onlineHelp: 'pct_migration', listenToGlobalEvent: false, - hidden: false + hidden: false, }, '->', { @@ -429,8 +429,8 @@ Ext.define('PVE.window.Migrate', { text: gettext('Migrate'), handler: 'startMigration', bind: { - disabled: '{!migration.possible}' - } - } - ] + disabled: '{!migration.possible}', + }, + }, + ], }); diff --git a/www/manager6/window/Restore.js b/www/manager6/window/Restore.js index 51f6a853..088c4267 100644 --- a/www/manager6/window/Restore.js +++ b/www/manager6/window/Restore.js @@ -36,14 +36,14 @@ Ext.define('PVE.window.Restore', { IDfield = Ext.create('Ext.form.field.Display', { name: 'vmid', value: me.vmid, - fieldLabel: (me.vmtype === 'lxc') ? 'CT' : 'VM' + fieldLabel: (me.vmtype === 'lxc') ? 'CT' : 'VM', }); } else { IDfield = Ext.create('PVE.form.GuestIDSelector', { name: 'vmid', guestType: me.vmtype, loadNextFreeID: true, - validateExists: false + validateExists: false, }); } @@ -51,7 +51,7 @@ Ext.define('PVE.window.Restore', { { xtype: 'displayfield', value: me.volidText || me.volid, - fieldLabel: gettext('Source') + fieldLabel: gettext('Source'), }, storagesel, IDfield, @@ -63,8 +63,8 @@ Ext.define('PVE.window.Restore', { emptyText: gettext('Defaults to target storage restore limit'), autoEl: { tag: 'div', - 'data-qtip': gettext("Use '0' to disable all bandwidth limits.") - } + 'data-qtip': gettext("Use '0' to disable all bandwidth limits."), + }, }, { xtype: 'fieldcontainer', @@ -77,9 +77,9 @@ Ext.define('PVE.window.Restore', { flex: 1, autoEl: { tag: 'div', - 'data-qtip': gettext('Autogenerate unique properties, e.g., MAC addresses') + 'data-qtip': gettext('Autogenerate unique properties, e.g., MAC addresses'), }, - checked: false + checked: false, }, { xtype: 'proxmoxcheckbox', @@ -87,7 +87,7 @@ Ext.define('PVE.window.Restore', { flex: 1, fieldLabel: gettext('Start after restore'), labelWidth: 105, - checked: false + checked: false, }], }, ]; @@ -97,7 +97,7 @@ Ext.define('PVE.window.Restore', { xtype: 'proxmoxcheckbox', name: 'unprivileged', value: true, - fieldLabel: gettext('Unprivileged container') + fieldLabel: gettext('Unprivileged container'), }); } @@ -106,9 +106,9 @@ Ext.define('PVE.window.Restore', { border: false, fieldDefaults: { labelWidth: 100, - anchor: '100%' + anchor: '100%', }, - items: items + items: items, }); var form = me.formPanel.getForm(); @@ -126,11 +126,11 @@ Ext.define('PVE.window.Restore', { var upid = response.result.data; var win = Ext.create('Proxmox.window.TaskViewer', { - upid: upid + upid: upid, }); win.show(); me.close(); - } + }, }); }; @@ -141,7 +141,7 @@ Ext.define('PVE.window.Restore', { var params = { vmid: me.vmid || values.vmid, - force: me.vmid ? 1 : 0 + force: me.vmid ? 1 : 0, }; if (values.unique) { params.unique = 1; } if (values.start) { params.start = 1; } @@ -178,7 +178,7 @@ Ext.define('PVE.window.Restore', { } else { doRestore(url, params); } - } + }, }); form.on('validitychange', function(f, valid) { @@ -199,9 +199,9 @@ Ext.define('PVE.window.Restore', { layout: 'auto', border: false, items: [ me.formPanel ], - buttons: [ submitBtn ] + buttons: [ submitBtn ], }); me.callParent(); - } + }, }); diff --git a/www/manager6/window/SafeDestroy.js b/www/manager6/window/SafeDestroy.js index 4506fad3..12b086d2 100644 --- a/www/manager6/window/SafeDestroy.js +++ b/www/manager6/window/SafeDestroy.js @@ -18,10 +18,10 @@ Ext.define('PVE.window.SafeDestroy', { config: { item: { id: undefined, - type: undefined + type: undefined, }, url: undefined, - params: {} + params: {}, }, getParams: function() { @@ -56,7 +56,7 @@ Ext.define('PVE.window.SafeDestroy', { if (!removeButton.isDisabled() && event.getKey() == event.ENTER) { removeButton.fireEvent('click', removeButton, event); } - } + }, }, 'button[reference=removeButton]': { click: function() { @@ -84,18 +84,18 @@ Ext.define('PVE.window.SafeDestroy', { listeners: { destroy: function () { view.close(); - } - } + }, + }, }); win.show(); } else { view.close(); } - } + }, }); - } - } - } + }, + }, + }, }, items: [ @@ -103,19 +103,19 @@ Ext.define('PVE.window.SafeDestroy', { xtype: 'component', cls: [ Ext.baseCSSPrefix + 'message-box-icon', Ext.baseCSSPrefix + 'message-box-warning', - Ext.baseCSSPrefix + 'dlg-icon'] + Ext.baseCSSPrefix + 'dlg-icon'], }, { xtype: 'container', flex: 1, layout: { type: 'vbox', - align: 'stretch' + align: 'stretch', }, items: [ { xtype: 'component', - reference: 'messageCmp' + reference: 'messageCmp', }, { itemId: 'confirmField', @@ -124,7 +124,7 @@ Ext.define('PVE.window.SafeDestroy', { name: 'confirm', labelWidth: 300, hideTrigger: true, - allowBlank: false + allowBlank: false, }, { xtype: 'proxmoxcheckbox', @@ -134,18 +134,18 @@ Ext.define('PVE.window.SafeDestroy', { checked: false, autoEl: { tag: 'div', - 'data-qtip': gettext('Remove from replication & backup jobs and HA resource configuration.') - } - } - ] - } + 'data-qtip': gettext('Remove from replication & backup jobs and HA resource configuration.'), + }, + }, + ], + }, ], buttons: [ { reference: 'removeButton', text: gettext('Remove'), - disabled: true - } + disabled: true, + }, ], initComponent : function() { @@ -190,5 +190,5 @@ Ext.define('PVE.window.SafeDestroy', { msg = gettext('Please enter the ID to confirm') + ' (' + item.id + ')'; confirmField.setFieldLabel(msg); - } + }, }); diff --git a/www/manager6/window/Settings.js b/www/manager6/window/Settings.js index 3bf974f0..0643c154 100644 --- a/www/manager6/window/Settings.js +++ b/www/manager6/window/Settings.js @@ -12,15 +12,15 @@ Ext.define('PVE.window.Settings', { { xtype: 'proxmoxHelpButton', onlineHelp: 'gui_my_settings', - hidden: false + hidden: false, }, '->', { text: gettext('Close'), handler: function() { this.up('window').close(); - } - } + }, + }, ], layout: 'hbox', @@ -78,7 +78,7 @@ Ext.define('PVE.window.Settings', { control: { '#xtermjs form': { dirtychange: 'set_button_status', - validitychange: 'set_button_status' + validitychange: 'set_button_status', }, '#xtermjs button': { click: function(button) { @@ -100,7 +100,7 @@ Ext.define('PVE.window.Settings', { field.resetOriginalValue(); }); me.set_button_status(); - } + }, }, 'button[name=reset]': { click: function () { @@ -118,7 +118,7 @@ Ext.define('PVE.window.Settings', { } window.location.reload(); - } + }, }, 'button[name=clear-username]': { click: function () { @@ -128,7 +128,7 @@ Ext.define('PVE.window.Settings', { usernamefield.setValue(Proxmox.Utils.noneText); sp.clear('login-username'); - } + }, }, 'grid[reference=dashboard-storages]': { selectionchange: function(grid, selected) { @@ -164,20 +164,20 @@ Ext.define('PVE.window.Settings', { }); me.getSelectionModel().select(items); me.resumeEvent('selectionchange'); - } + }, }, 'field[reference=summarycolumns]': { change: function(el, newValue) { var sp = Ext.state.Manager.getProvider(); sp.set('summarycolumns', newValue); - } + }, }, 'field[reference=guestNotesCollapse]': { change: function(e, v) { Ext.state.Manager.getProvider().set('guest-notes-collapse', v); }, }, - } + }, }, items: [{ @@ -187,34 +187,34 @@ Ext.define('PVE.window.Settings', { margin: '5', layout: { type: 'vbox', - align: 'left' + align: 'left', }, defaults: { width: '100%', - margin: '0 0 10 0' + margin: '0 0 10 0', }, items: [ { xtype: 'displayfield', fieldLabel: gettext('Dashboard Storages'), labelAlign: 'left', - labelWidth: '50%' + labelWidth: '50%', }, { xtype: 'grid', maxHeight: 150, reference: 'dashboard-storages', selModel: { - selType: 'checkboxmodel' + selType: 'checkboxmodel', }, columns: [{ header: gettext('Name'), dataIndex: 'storage', - flex: 1 - },{ + flex: 1, + }, { header: gettext('Node'), dataIndex: 'node', - flex: 1 + flex: 1, }], store: { type: 'diff', @@ -222,14 +222,14 @@ Ext.define('PVE.window.Settings', { rstore: PVE.data.ResourceStore, filters: [{ property: 'type', - value: 'storage' + value: 'storage', }], - sorters: [ 'node','storage'] - } + sorters: [ 'node', 'storage'], + }, }, { xtype: 'box', - autoEl: { tag: 'hr'} + autoEl: { tag: 'hr'}, }, { xtype: 'container', @@ -242,7 +242,7 @@ Ext.define('PVE.window.Settings', { stateId: 'login-username', reference: 'savedUserName', flex: 1, - value: '' + value: '', }, { xtype: 'button', @@ -250,11 +250,11 @@ Ext.define('PVE.window.Settings', { text: gettext('Reset'), name: 'clear-username', }, - ] + ], }, { xtype: 'box', - autoEl: { tag: 'hr'} + autoEl: { tag: 'hr'}, }, { xtype: 'container', @@ -272,11 +272,11 @@ Ext.define('PVE.window.Settings', { tooltip: gettext('Reset all layout changes (for example, column widths)'), name: 'reset', }, - ] + ], }, { xtype: 'box', - autoEl: { tag: 'hr'} + autoEl: { tag: 'hr'}, }, { xtype: 'proxmoxKVComboBox', @@ -303,7 +303,7 @@ Ext.define('PVE.window.Settings', { ['auto', 'auto (Collapse if empty)'], ], }, - ] + ], }, { xtype: 'container', @@ -314,7 +314,7 @@ Ext.define('PVE.window.Settings', { width: '100%', // right margin ensures that the right border of the fieldsets // is shown - margin: '0 2 10 0' + margin: '0 2 10 0', }, items:[ { @@ -327,7 +327,7 @@ Ext.define('PVE.window.Settings', { border: false, layout: { type: 'vbox', - algin: 'left' + algin: 'left', }, defaults: { width: '100%', @@ -339,7 +339,7 @@ Ext.define('PVE.window.Settings', { name: 'fontFamily', reference: 'fontFamily', emptyText: Proxmox.Utils.defaultText, - fieldLabel: gettext('Font-Family') + fieldLabel: gettext('Font-Family'), }, { xtype: 'proxmoxintegerfield', @@ -347,14 +347,14 @@ Ext.define('PVE.window.Settings', { name: 'fontSize', reference: 'fontSize', minValue: 1, - fieldLabel: gettext('Font-Size') + fieldLabel: gettext('Font-Size'), }, { xtype: 'numberfield', name: 'letterSpacing', reference: 'letterSpacing', emptyText: Proxmox.Utils.defaultText, - fieldLabel: gettext('Letter Spacing') + fieldLabel: gettext('Letter Spacing'), }, { xtype: 'numberfield', @@ -362,13 +362,13 @@ Ext.define('PVE.window.Settings', { minValue: 0.1, reference: 'lineHeight', emptyText: Proxmox.Utils.defaultText, - fieldLabel: gettext('Line Height') + fieldLabel: gettext('Line Height'), }, { xtype: 'container', layout: { type: 'hbox', - pack: 'end' + pack: 'end', }, defaults: { margin: '0 0 0 5', @@ -378,19 +378,19 @@ Ext.define('PVE.window.Settings', { xtype: 'button', reference: 'xtermreset', disabled: true, - text: gettext('Reset') + text: gettext('Reset'), }, { xtype: 'button', reference: 'xtermsave', disabled: true, - text: gettext('Save') - } - ] - } - ] - }] - },{ + text: gettext('Save'), + }, + ], + }, + ], + }], + }, { xtype: 'fieldset', title: gettext('noVNC Settings'), items: [ @@ -409,23 +409,23 @@ Ext.define('PVE.window.Settings', { inputValue: 'scale', boxLabel: 'Local Scaling', checked: true, - },{ + }, { xtype: 'radiofield', name: 'noVNCScalingField', inputValue: 'off', boxLabel: 'Off', margin: '0 0 0 10', - } + }, ], listeners: { change: function(el, newValue, undefined) { var sp = Ext.state.Manager.getProvider(); sp.set('novnc-scaling', newValue.noVNCScalingField); - } + }, }, }, - ] + ], }, - ] + ], }], }); diff --git a/www/manager6/window/Snapshot.js b/www/manager6/window/Snapshot.js index 73a7de92..ff9ab9e0 100644 --- a/www/manager6/window/Snapshot.js +++ b/www/manager6/window/Snapshot.js @@ -53,7 +53,7 @@ Ext.define('PVE.window.Snapshot', { let res = response.result.data; let enabled = PVE.Parser.parsePropertyString(res.agent, 'enabled'); vm.set('guestAgentEnabled', !!PVE.Parser.parseBoolean(enabled.enabled)); - } + }, }); } @@ -64,7 +64,7 @@ Ext.define('PVE.window.Snapshot', { value: me.snapname, fieldLabel: gettext('Name'), vtype: 'ConfigId', - allowBlank: false + allowBlank: false, }, { xtype: 'displayfield', @@ -72,7 +72,7 @@ Ext.define('PVE.window.Snapshot', { disabled: me.isCreate, name: 'snaptime', renderer: PVE.Utils.render_timestamp_human_readable, - fieldLabel: gettext('Timestamp') + fieldLabel: gettext('Timestamp'), }, { xtype: 'proxmoxcheckbox', @@ -83,14 +83,14 @@ Ext.define('PVE.window.Snapshot', { uncheckedValue: 0, defaultValue: 0, checked: 1, - fieldLabel: gettext('Include RAM') + fieldLabel: gettext('Include RAM'), }, { xtype: 'textareafield', grow: true, editable: !me.viewonly, name: 'description', - fieldLabel: gettext('Description') + fieldLabel: gettext('Description'), }, { xtype: 'displayfield', @@ -114,9 +114,9 @@ Ext.define('PVE.window.Snapshot', { sorters: [ { property : 'key', - direction: 'ASC' - } - ] + direction: 'ASC', + }, + ], }, columns: [ { @@ -128,9 +128,9 @@ Ext.define('PVE.window.Snapshot', { header: gettext('Value'), flex: 1, dataIndex: 'value', - } - ] - } + }, + ], + }, ]; me.url = `/nodes/${me.nodename}/${me.type}/${me.vmid}/snapshot`; @@ -175,7 +175,7 @@ Ext.define('PVE.window.Snapshot', { summarystore.fireEvent('refresh', summarystore); me.setValues(response.result.data); - } + }, }); - } + }, }); diff --git a/www/manager6/window/StartupEdit.js b/www/manager6/window/StartupEdit.js index 4be3dbb8..2b908eb0 100644 --- a/www/manager6/window/StartupEdit.js +++ b/www/manager6/window/StartupEdit.js @@ -32,26 +32,26 @@ Ext.define('PVE.panel.StartupInputPanel', { name: 'order', defaultValue: '', emptyText: 'any', - fieldLabel: gettext('Start/Shutdown order') + fieldLabel: gettext('Start/Shutdown order'), }, { xtype: 'textfield', name: 'up', defaultValue: '', emptyText: 'default', - fieldLabel: gettext('Startup delay') + fieldLabel: gettext('Startup delay'), }, { xtype: 'textfield', name: 'down', defaultValue: '', emptyText: 'default', - fieldLabel: gettext('Shutdown timeout') - } + fieldLabel: gettext('Shutdown timeout'), + }, ]; me.callParent(); - } + }, }); Ext.define('PVE.window.StartupEdit', { @@ -68,9 +68,9 @@ Ext.define('PVE.window.StartupEdit', { Ext.applyIf(me, { subject: gettext('Start/Shutdown order'), fieldDefaults: { - labelWidth: 120 + labelWidth: 120, }, - items: [ ipanel ] + items: [ ipanel ], }); me.callParent(); @@ -80,7 +80,7 @@ Ext.define('PVE.window.StartupEdit', { var i, confid; me.vmconfig = response.result.data; ipanel.setStartup(me.vmconfig.startup); - } + }, }); - } + }, }); diff --git a/www/manager6/window/Wizard.js b/www/manager6/window/Wizard.js index 88a6626b..5acb86a7 100644 --- a/www/manager6/window/Wizard.js +++ b/www/manager6/window/Wizard.js @@ -130,7 +130,7 @@ Ext.define('PVE.window.Wizard', { margins: '5 5 0 5', fieldDefaults: { labelWidth: 100, - anchor: '100%' + anchor: '100%', }, items: [{ itemId: 'wizcontent', @@ -144,16 +144,16 @@ Ext.define('PVE.window.Wizard', { }, tabchange: function(tp, newcard, oldcard) { tabchange(tp, newcard, oldcard); - } + }, }, - items: tabs - }] - } + items: tabs, + }], + }, ], fbar: [ { xtype: 'proxmoxHelpButton', - itemId: 'help' + itemId: 'help', }, '->', { @@ -169,8 +169,8 @@ Ext.define('PVE.window.Wizard', { }); sp.set('proxmox-advanced-cb', val); - } - } + }, + }, }, { text: gettext('Back'), @@ -188,7 +188,7 @@ Ext.define('PVE.window.Wizard', { if (ntab) { tp.setActiveTab(ntab); } - } + }, }, { text: gettext('Next'), @@ -212,7 +212,7 @@ Ext.define('PVE.window.Wizard', { tp.setActiveTab(ntab); } - } + }, }, { text: gettext('Finish'), @@ -223,9 +223,9 @@ Ext.define('PVE.window.Wizard', { var tp = me.down('#wizcontent'); var atab = tp.getActiveTab(); atab.onSubmit(); - } - } - ] + }, + }, + ], }); me.callParent(); @@ -264,5 +264,5 @@ Ext.define('PVE.window.Wizard', { field.on('change', validcheck); field.on('validitychange', validcheck); }); - } + }, }); -- 2.39.2