From 32d243b872876781bf25b07835261d775ce3b09e Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Mon, 30 Jul 2018 23:24:55 -0400 Subject: [PATCH] Transfer the patch do not cut and paste - My bad Change-Id: Ic0db22e16feb3e42c4af70426e2afe5775d46400 Signed-off-by: Kevin Scott Adams --- pve-manager/js/pvemanagerlib.js.patch | 120 +++++++++++++------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/pve-manager/js/pvemanagerlib.js.patch b/pve-manager/js/pvemanagerlib.js.patch index 52a36da..73e076d 100644 --- a/pve-manager/js/pvemanagerlib.js.patch +++ b/pve-manager/js/pvemanagerlib.js.patch @@ -1,66 +1,66 @@ ---- pvemanagerlib.js 2018-07-10 08:46:32.000000000 -0400 -+++ pvemanagerlib.js.new 2018-07-30 22:19:23.207915760 -0400 +--- pvemanagerlib.js 2018-07-10 08:46:32.000000000 -0400 ++++ pvemanagerlib.js.new 2018-07-30 22:19:23.207915760 -0400 @@ -5379,6 +5379,7 @@ alias: ['widget.pveiScsiProviderSelector'], comboItems: [ - ['comstar', 'Comstar'], -+ ['freenas', 'FreeNAS-API'], - [ 'istgt', 'istgt'], - [ 'iet', 'IET'] + ['comstar', 'Comstar'], ++ ['freenas', 'FreeNAS-API'], + [ 'istgt', 'istgt'], + [ 'iet', 'IET'] ] @@ -27361,6 +27362,30 @@ - value: '', - fieldLabel: gettext('Target group'), - allowBlank: true -+ }, -+ { -+ xtype: me.isCreate ? 'textfield' : 'displayfield', -+ name: 'freenas_user', -+ value: '', -+ hidden: me.iscsiprovider !== "freenas", -+ fieldLabel: gettext('FreeNAS User'), -+ allowBlank: true -+ }, -+ { -+ xtype: me.isCreate ? 'textfield' : 'displayfield', -+ name: 'freenas_password', -+ value: '', -+ hidden: me.iscsiprovider !== "freenas", -+ fieldLabel: gettext('FreeNAS Password'), -+ allowBlank: true -+ }, -+ { -+ xtype: 'proxmoxcheckbox', -+ name: 'freenas_use_ssl', -+ checked: false, -+ uncheckedValue: 0, -+ hidden: me.iscsiprovider !== "freenas", -+ fieldLabel: gettext('FreeNAS API use SSL') - } - ]; - + value: '', + fieldLabel: gettext('Target group'), + allowBlank: true ++ }, ++ { ++ xtype: me.isCreate ? 'textfield' : 'displayfield', ++ name: 'freenas_user', ++ value: '', ++ hidden: me.iscsiprovider !== "freenas", ++ fieldLabel: gettext('FreeNAS User'), ++ allowBlank: true ++ }, ++ { ++ xtype: me.isCreate ? 'textfield' : 'displayfield', ++ name: 'freenas_password', ++ value: '', ++ hidden: me.iscsiprovider !== "freenas", ++ fieldLabel: gettext('FreeNAS Password'), ++ allowBlank: true ++ }, ++ { ++ xtype: 'proxmoxcheckbox', ++ name: 'freenas_use_ssl', ++ checked: false, ++ uncheckedValue: 0, ++ hidden: me.iscsiprovider !== "freenas", ++ fieldLabel: gettext('FreeNAS API use SSL') + } + ]; + @@ -27370,7 +27395,23 @@ - name: 'iscsiprovider', - value: 'comstar', - fieldLabel: gettext('iSCSI Provider'), -- allowBlank: false -+ allowBlank: false, -+ listeners: { -+ change: function(f, value) { -+ if (value === "freenas") { -+ me.down('field[name=freenas_user]').setHidden(false); -+ me.down('field[name=freenas_password]').setHidden(false); -+ me.down('field[name=freenas_use_ssl]').setHidden(false); -+ } else { -+ me.down('field[name=freenas_user]').setHidden(true); -+ me.down('field[name=freenas_user]').setValue(''); -+ me.down('field[name=freenas_password]').setHidden(true); -+ me.down('field[name=freenas_password]').setValue(''); -+ me.down('field[name=freenas_use_ssl]').setHidden(true); -+ me.down('field[name=freenas_use_ssl]').setValue(false); -+ } -+ } -+ } - }, - { - xtype: 'proxmoxcheckbox', + name: 'iscsiprovider', + value: 'comstar', + fieldLabel: gettext('iSCSI Provider'), +- allowBlank: false ++ allowBlank: false, ++ listeners: { ++ change: function(f, value) { ++ if (value === "freenas") { ++ me.down('field[name=freenas_user]').setHidden(false); ++ me.down('field[name=freenas_password]').setHidden(false); ++ me.down('field[name=freenas_use_ssl]').setHidden(false); ++ } else { ++ me.down('field[name=freenas_user]').setHidden(true); ++ me.down('field[name=freenas_user]').setValue(''); ++ me.down('field[name=freenas_password]').setHidden(true); ++ me.down('field[name=freenas_password]').setValue(''); ++ me.down('field[name=freenas_use_ssl]').setHidden(true); ++ me.down('field[name=freenas_use_ssl]').setValue(false); ++ } ++ } ++ } + }, + { + xtype: 'proxmoxcheckbox',