public_git
/
freenas-proxmox
mirror of https://github.com/TheGrandWazoo/freenas-proxmox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #97 from TheGrandWazoo/master 

Damn copy and paste.
This commit is contained in:
Kevin Scott Adams 2021-04-13 14:37:16 -04:00 committed by GitHub
parent 9b95a08ed4 bd13f0a8c8
commit bd9c2e27ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 168 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

336
pve-manager/js/pvemanagerlib.js.patch
View File

@ -1,189 +1,189 @@
--- pvemanagerlib.js.orig 2021-03-09 02:22:47.000000000 -0500 --- pvemanagerlib.js.orig 2021-03-09 02:22:47.000000000 -0500
+++ pvemanagerlib.js 2021-03-20 11:52:39.694828636 -0400 +++ pvemanagerlib.js 2021-03-20 11:52:39.694828636 -0400
@@ -7849,6 +7849,7 @@ @@ -7849,6 +7849,7 @@
alias: ['widget.pveiScsiProviderSelector'], alias: ['widget.pveiScsiProviderSelector'],
comboItems: [ comboItems: [
['comstar', 'Comstar'], ['comstar', 'Comstar'],
+ ['freenas', 'FreeNAS-API'], + ['freenas', 'FreeNAS-API'],
['istgt', 'istgt'], ['istgt', 'istgt'],
['iet', 'IET'], ['iet', 'IET'],
['LIO', 'LIO'], ['LIO', 'LIO'],
@@ -46874,6 +46875,7 @@ @@ -46874,6 +46875,7 @@
data: { data: {
isLIO: false, isLIO: false,
isComstar: true, isComstar: true,
+ isFreeNAS: false, + isFreeNAS: false,
hasWriteCacheOption: true, hasWriteCacheOption: true,
}, },
}, },
@@ -46886,10 +46888,26 @@ @@ -46886,10 +46888,26 @@
}, },
}, },
changeISCSIProvider: function(f, newVal, oldVal) { changeISCSIProvider: function(f, newVal, oldVal) {
+ var me = this; + var me = this;
var vm = this.getViewModel(); var vm = this.getViewModel();
vm.set('isLIO', newVal === 'LIO'); vm.set('isLIO', newVal === 'LIO');
vm.set('isComstar', newVal === 'comstar'); vm.set('isComstar', newVal === 'comstar');
- vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt'); - vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt');
+ vm.set('isFreeNAS', newVal === 'freenas'); + vm.set('isFreeNAS', newVal === 'freenas');
+ vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'freenas' || newVal === 'istgt'); + vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'freenas' || newVal === 'istgt');
+ if (newVal !== 'freenas') { + if (newVal !== 'freenas') {
+ me.lookupReference('freenas_use_ssl_field').setValue(false); + me.lookupReference('freenas_use_ssl_field').setValue(false);
+ me.lookupReference('freenas_apiv4_host_field').setValue(''); + me.lookupReference('freenas_apiv4_host_field').setValue('');
+ me.lookupReference('freenas_user_field').setValue(''); + me.lookupReference('freenas_user_field').setValue('');
+ me.lookupReference('freenas_user_field').allowBlank = true; + me.lookupReference('freenas_user_field').allowBlank = true;
+ me.lookupReference('freenas_password_field').setValue(''); + me.lookupReference('freenas_password_field').setValue('');
+ me.lookupReference('freenas_password_field').allowBlank = true; + me.lookupReference('freenas_password_field').allowBlank = true;
+ me.lookupReference('freenas_confirmpw_field').setValue(''); + me.lookupReference('freenas_confirmpw_field').setValue('');
+ me.lookupReference('freenas_confirmpw_field').allowBlank = true; + me.lookupReference('freenas_confirmpw_field').allowBlank = true;
+ } else { + } else {
+ me.lookupReference('freenas_user_field').allowBlank = false; + me.lookupReference('freenas_user_field').allowBlank = false;
+ me.lookupReference('freenas_password_field').allowBlank = false; + me.lookupReference('freenas_password_field').allowBlank = false;
+ me.lookupReference('freenas_confirmpw_field').allowBlank = false; + me.lookupReference('freenas_confirmpw_field').allowBlank = false;
+ } + }
}, },
}, },
@@ -46907,6 +46925,7 @@ @@ -46907,6 +46925,7 @@
}, },
setValues: function diff(values) { setValues: function diff(values) {
+ values.freenas_confirmpw = values.freenas_password; + values.freenas_confirmpw = values.freenas_password;
values.writecache = values.nowritecache ? 0 : 1; values.writecache = values.nowritecache ? 0 : 1;
this.callParent([values]); this.callParent([values]);
}, },
@@ -46923,7 +46942,7 @@ @@ -46923,7 +46942,7 @@
allowBlank: false, allowBlank: false,
}, },
{ {
- xtype: me.isCreate ? 'textfield' : 'displayfield', - xtype: me.isCreate ? 'textfield' : 'displayfield',
+ xtype: 'textfield', + xtype: 'textfield',
name: 'pool', name: 'pool',
value: '', value: '',
fieldLabel: gettext('Pool'), fieldLabel: gettext('Pool'),
@@ -46933,11 +46952,11 @@ @@ -46933,11 +46952,11 @@
xtype: me.isCreate ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'blocksize', name: 'blocksize',
value: '4k', value: '4k',
- fieldLabel: gettext('Block Size'), - fieldLabel: gettext('Block Size'),
+ fieldLabel: gettext('ZFS Block Size'), + fieldLabel: gettext('ZFS Block Size'),
allowBlank: false, allowBlank: false,
}, },
{ {
- xtype: me.isCreate ? 'textfield' : 'displayfield', - xtype: me.isCreate ? 'textfield' : 'displayfield',
+ xtype: 'textfield', + xtype: 'textfield',
name: 'target', name: 'target',
value: '', value: '',
fieldLabel: gettext('Target'), fieldLabel: gettext('Target'),
@@ -46948,9 +46967,34 @@ @@ -46948,9 +46967,34 @@
name: 'comstar_tg', name: 'comstar_tg',
value: '', value: '',
fieldLabel: gettext('Target group'), fieldLabel: gettext('Target group'),
- bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' }, - bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
+ bind: { + bind: {
+ hidden: '{!isComstar}' + hidden: '{!isComstar}'
+ }, + },
allowBlank: true, allowBlank: true,
}, },
+ { + {
+ xtype: 'proxmoxcheckbox', + xtype: 'proxmoxcheckbox',
+ name: 'freenas_use_ssl', + name: 'freenas_use_ssl',
+ reference: 'freenas_use_ssl_field', + reference: 'freenas_use_ssl_field',
+ inputId: 'freenas_use_ssl_field', + inputId: 'freenas_use_ssl_field',
+ checked: false, + checked: false,
+ bind: { + bind: {
+ hidden: '{!isFreeNAS}' + hidden: '{!isFreeNAS}'
+ }, + },
+ uncheckedValue: 0, + uncheckedValue: 0,
+ fieldLabel: gettext('API use SSL'), + fieldLabel: gettext('API use SSL'),
+ }, + },
+ { + {
+ xtype: 'textfield', + xtype: 'textfield',
+ name: 'freenas_user', + name: 'freenas_user',
+ reference: 'freenas_user_field', + reference: 'freenas_user_field',
+ inputId: 'freenas_user_field', + inputId: 'freenas_user_field',
+ value: '', + value: '',
+ fieldLabel: gettext('API Username'), + fieldLabel: gettext('API Username'),
+ bind: { + bind: {
+ hidden: '{!isFreeNAS}' + hidden: '{!isFreeNAS}'
+ }, + },
+ }, + },
]; ];
me.column2 = [ me.column2 = [
@@ -46980,7 +47024,9 @@ @@ -46980,7 +47024,9 @@
xtype: me.isCreate ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'comstar_hg', name: 'comstar_hg',
value: '', value: '',
- bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' }, - bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
+ bind: { + bind: {
+ hidden: '{!isComstar}' + hidden: '{!isComstar}'
+ }, + },
fieldLabel: gettext('Host group'), fieldLabel: gettext('Host group'),
allowBlank: true, allowBlank: true,
}, },
@@ -46988,9 +47034,62 @@ @@ -46988,9 +47034,62 @@
xtype: me.isCreate ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'lio_tpg', name: 'lio_tpg',
value: '', value: '',
- bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' }, - bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' },
- allowBlank: false, - allowBlank: false,
+ bind: { + bind: {
+ hidden: '{!isLIO}' + hidden: '{!isLIO}'
+ }, + },
fieldLabel: gettext('Target portal group'), fieldLabel: gettext('Target portal group'),
+ allowBlank: true + allowBlank: true
+ }, + },
+ { + {
+ xtype: 'proxmoxtextfield', + xtype: 'proxmoxtextfield',
+ name: 'freenas_apiv4_host', + name: 'freenas_apiv4_host',
+ reference: 'freenas_apiv4_host_field', + reference: 'freenas_apiv4_host_field',
+ value: '', + value: '',
+ editable: true, + editable: true,
+ emptyText: Proxmox.Utils.noneText, + emptyText: Proxmox.Utils.noneText,
+ bind: { + bind: {
+ hidden: '{!isFreeNAS}' + hidden: '{!isFreeNAS}'
+ }, + },
+ fieldLabel: gettext('API IPv4 Host'), + fieldLabel: gettext('API IPv4 Host'),
+ }, + },
+ { + {
+ xtype: 'proxmoxtextfield', + xtype: 'proxmoxtextfield',
+ name: 'freenas_password', + name: 'freenas_password',
+ reference: 'freenas_password_field', + reference: 'freenas_password_field',
+ inputType: me.isCreate ? '' : 'password', + inputType: me.isCreate ? '' : 'password',
+ value: '', + value: '',
+ editable: true, + editable: true,
+ emptyText: Proxmox.Utils.noneText, + emptyText: Proxmox.Utils.noneText,
+ bind: { + bind: {
+ hidden: '{!isFreeNAS}' + hidden: '{!isFreeNAS}'
+ }, + },
+ fieldLabel: gettext('API Password'), + fieldLabel: gettext('API Password'),
+ change: function(f, value) { + change: function(f, value) {
+ if (f.rendered) { + if (f.rendered) {
+ f.up().down('field[name=freenas_confirmpw]').validate(); + f.up().down('field[name=freenas_confirmpw]').validate();
+ } + }
+ }, + },
+ }, + },
+ { + {
+ xtype: 'proxmoxtextfield', + xtype: 'proxmoxtextfield',
+ name: 'freenas_confirmpw', + name: 'freenas_confirmpw',
+ reference: 'freenas_confirmpw_field', + reference: 'freenas_confirmpw_field',
+ inputType: me.isCreate ? '' : 'password', + inputType: me.isCreate ? '' : 'password',
+ value: '', + value: '',
+ editable: true, + editable: true,
+ submitValue: false, + submitValue: false,
+ emptyText: Proxmox.Utils.noneText, + emptyText: Proxmox.Utils.noneText,
+ bind: { + bind: {
+ hidden: '{!isFreeNAS}' + hidden: '{!isFreeNAS}'
+ }, + },
+ fieldLabel: gettext('Confirm Password'), + fieldLabel: gettext('Confirm Password'),
+ validator: function(value) { + validator: function(value) {
+ var pw = this.up().down('field[name=freenas_password]').getValue(); + var pw = this.up().down('field[name=freenas_password]').getValue();
+ if (pw !== value) { + if (pw !== value) {
+ return "Passwords do not match!"; + return "Passwords do not match!";
+ } + }
+ return true; + return true;
+ }, + },
}, },
]; ];