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

Transfer the patch do not cut and paste 

- My bad

Change-Id: Ic0db22e16feb3e42c4af70426e2afe5775d46400
Signed-off-by: Kevin Scott Adams <kevin.adams@ksatechnologies.com>
This commit is contained in:
Kevin Scott Adams 2018-07-30 23:24:55 -04:00
parent a6906fe4d6
commit 32d243b872
1 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,66 +1,66 @@
--- pvemanagerlib.js 2018-07-10 08:46:32.000000000 -0400 --- pvemanagerlib.js 2018-07-10 08:46:32.000000000 -0400
+++ pvemanagerlib.js.new 2018-07-30 22:19:23.207915760 -0400 +++ pvemanagerlib.js.new 2018-07-30 22:19:23.207915760 -0400
@@ -5379,6 +5379,7 @@ @@ -5379,6 +5379,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']
] ]
@@ -27361,6 +27362,30 @@ @@ -27361,6 +27362,30 @@
value: '', value: '',
fieldLabel: gettext('Target group'), fieldLabel: gettext('Target group'),
allowBlank: true allowBlank: true
+ }, + },
+ { + {
+ xtype: me.isCreate ? 'textfield' : 'displayfield', + xtype: me.isCreate ? 'textfield' : 'displayfield',
+ name: 'freenas_user', + name: 'freenas_user',
+ value: '', + value: '',
+ hidden: me.iscsiprovider !== "freenas", + hidden: me.iscsiprovider !== "freenas",
+ fieldLabel: gettext('FreeNAS User'), + fieldLabel: gettext('FreeNAS User'),
+ allowBlank: true + allowBlank: true
+ }, + },
+ { + {
+ xtype: me.isCreate ? 'textfield' : 'displayfield', + xtype: me.isCreate ? 'textfield' : 'displayfield',
+ name: 'freenas_password', + name: 'freenas_password',
+ value: '', + value: '',
+ hidden: me.iscsiprovider !== "freenas", + hidden: me.iscsiprovider !== "freenas",
+ fieldLabel: gettext('FreeNAS Password'), + fieldLabel: gettext('FreeNAS Password'),
+ allowBlank: true + allowBlank: true
+ }, + },
+ { + {
+ xtype: 'proxmoxcheckbox', + xtype: 'proxmoxcheckbox',
+ name: 'freenas_use_ssl', + name: 'freenas_use_ssl',
+ checked: false, + checked: false,
+ uncheckedValue: 0, + uncheckedValue: 0,
+ hidden: me.iscsiprovider !== "freenas", + hidden: me.iscsiprovider !== "freenas",
+ fieldLabel: gettext('FreeNAS API use SSL') + fieldLabel: gettext('FreeNAS API use SSL')
} }
]; ];
@@ -27370,7 +27395,23 @@ @@ -27370,7 +27395,23 @@
name: 'iscsiprovider', name: 'iscsiprovider',
value: 'comstar', value: 'comstar',
fieldLabel: gettext('iSCSI Provider'), fieldLabel: gettext('iSCSI Provider'),
- allowBlank: false - allowBlank: false
+ allowBlank: false, + allowBlank: false,
+ listeners: { + listeners: {
+ change: function(f, value) { + change: function(f, value) {
+ if (value === "freenas") { + if (value === "freenas") {
+ me.down('field[name=freenas_user]').setHidden(false); + me.down('field[name=freenas_user]').setHidden(false);
+ me.down('field[name=freenas_password]').setHidden(false); + me.down('field[name=freenas_password]').setHidden(false);
+ me.down('field[name=freenas_use_ssl]').setHidden(false); + me.down('field[name=freenas_use_ssl]').setHidden(false);
+ } else { + } else {
+ me.down('field[name=freenas_user]').setHidden(true); + me.down('field[name=freenas_user]').setHidden(true);
+ me.down('field[name=freenas_user]').setValue(''); + me.down('field[name=freenas_user]').setValue('');
+ me.down('field[name=freenas_password]').setHidden(true); + me.down('field[name=freenas_password]').setHidden(true);
+ me.down('field[name=freenas_password]').setValue(''); + me.down('field[name=freenas_password]').setValue('');
+ me.down('field[name=freenas_use_ssl]').setHidden(true); + me.down('field[name=freenas_use_ssl]').setHidden(true);
+ me.down('field[name=freenas_use_ssl]').setValue(false); + me.down('field[name=freenas_use_ssl]').setValue(false);
+ } + }
+ } + }
+ } + }
}, },
{ {
xtype: 'proxmoxcheckbox', xtype: 'proxmoxcheckbox',