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

- Updates and enhancements to pve-manager and pve-docs 

Updates for pve-manager 5.2-6 and pve-docs 5.2-5. Fixes issue #13.
Added some functionality to the js code to be selective on the FreeNAS
fields only when FreeNAS-API is chosen. Fixes issue #14.
This commit is contained in:
Kevin Scott Adams 2018-07-30 22:48:37 -04:00
parent cde040aeca
commit 458549ae2a
2 changed files with 71 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pve-docs/api-viewer/apidoc.js.patch
View File

@ -1,17 +1,17 @@
--- /usr/share/pve-docs/api-viewer/apidoc.js.orig 2018-06-04 12:08:17.416780601 +0800 --- apidoc.js 2018-07-10 06:05:33.000000000 -0400
+++ /usr/share/pve-docs/api-viewer/apidoc.js 2018-06-04 12:07:28.073832212 +0800 +++ apidoc.js.new 2018-07-30 22:21:11.479045222 -0400
@@ -27549,6 +27549,24 @@ @@ -27584,6 +27584,24 @@
"type" : "string", "type" : "string",
"typetext" : "<string>" "typetext" : "<string>"
}, },
+ "freenas_user" : { + "freenas_user" : {
+ "description" : "FreeNAS user for API calls", + "description" : "FreeNAS user for API access",
+ "optional" : 1, + "optional" : 1,
+ "type" : "string", + "type" : "string",
+ "typetext" : "<string>" + "typetext" : "<string>"
+ }, + },
+ "freenas_password" : { + "freenas_password" : {
+ "description" : "FreeNAS password for API calls", + "description" : "FreeNAS password for API access",
+ "optional" : 1, + "optional" : 1,
+ "type" : "string", + "type" : "string",
+ "typetext" : "<string>" + "typetext" : "<string>"
@ -25,18 +25,18 @@
"content" : { "content" : {
"description" : "Allowed content types.\n\nNOTE: the value 'rootdir' is used for Containers, and value 'images' for VMs.\n", "description" : "Allowed content types.\n\nNOTE: the value 'rootdir' is used for Containers, and value 'images' for VMs.\n",
"format" : "pve-storage-content-list", "format" : "pve-storage-content-list",
@@ -27896,6 +27914,24 @@ @@ -27949,6 +27967,24 @@
"type" : "string", "type" : "string",
"typetext" : "<string>" "typetext" : "<string>"
}, },
+ "freenas_user" : { + "freenas_user" : {
+ "description" : "FreeNAS user for API calls", + "description" : "FreeNAS user for API access",
+ "optional" : 1, + "optional" : 1,
+ "type" : "string", + "type" : "string",
+ "typetext" : "<string>" + "typetext" : "<string>"
+ }, + },
+ "freenas_password" : { + "freenas_password" : {
+ "description" : "FreeNAS password for API calls", + "description" : "FreeNAS password for API access",
+ "optional" : 1, + "optional" : 1,
+ "type" : "string", + "type" : "string",
+ "typetext" : "<string>" + "typetext" : "<string>"

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

@ -1,38 +1,66 @@
--- /usr/share/pve-manager/js/pvemanagerlib.js.orig 2018-06-04 11:21:26.419121310 +0800 --- pvemanagerlib.js 2018-07-10 08:46:32.000000000 -0400
+++ /usr/share/pve-manager/js/pvemanagerlib.js 2018-06-04 11:52:58.628592707 +0800 +++ pvemanagerlib.js.new 2018-07-30 22:19:23.207915760 -0400
@@ -5356,6 +5356,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']
] ]
@@ -27343,6 +27344,27 @@ @@ -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: '',
+ fieldLabel: gettext('FreeNAS User'), + hidden: me.iscsiprovider !== "freenas",
+ allowBlank: true + fieldLabel: gettext('FreeNAS User'),
+ }, + allowBlank: true
+ { + },
+ xtype: me.isCreate ? 'textfield' : 'displayfield', + {
+ name: 'freenas_password', + xtype: me.isCreate ? 'textfield' : 'displayfield',
+ value: '', + name: 'freenas_password',
+ fieldLabel: gettext('FreeNAS Password'), + value: '',
+ allowBlank: true + hidden: me.iscsiprovider !== "freenas",
+ }, + fieldLabel: gettext('FreeNAS Password'),
+ { + allowBlank: true
+ xtype: 'proxmoxcheckbox', + },
+ name: 'freenas_use_ssl', + {
+ checked: false, + xtype: 'proxmoxcheckbox',
+ uncheckedValue: 0, + name: 'freenas_use_ssl',
+ fieldLabel: gettext('FreeNAS API 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',