Skip to content

Commit 572c81a

Browse files
TheGrandWazooTheGrandWazoo
committed
Updated patch files.
- Updated patch file for 6.4-8 due to changes in functions declarations.
1 parent 1048ee2 commit 572c81a

File tree

2 files changed

+202
-13
lines changed

2 files changed

+202
-13
lines changed

‎pve-manager/js/pvemanagerlib-6.4-8_1.js.patch

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
--- pvemanagerlib.js.orig 2021-05-27 08:28:35.000000000 -0400
2+
+++ pvemanagerlib.js 2021-06-10 11:03:15.380175988 -0400
3+
@@ -7900,6 +7900,7 @@
4+
alias: ['widget.pveiScsiProviderSelector'],
5+
comboItems: [
6+
['comstar', 'Comstar'],
7+
+ ['freenas', 'FreeNAS-API'],
8+
['istgt', 'istgt'],
9+
['iet', 'IET'],
10+
['LIO', 'LIO'],
11+
@@ -47367,6 +47368,7 @@
12+
data: {
13+
isLIO: false,
14+
isComstar: true,
15+
+ isFreeNAS: false,
16+
hasWriteCacheOption: true,
17+
},
18+
},
19+
@@ -47379,10 +47381,26 @@
20+
},
21+
},
22+
changeISCSIProvider: function(f, newVal, oldVal) {
23+
+ var me = this;
24+
var vm = this.getViewModel();
25+
vm.set('isLIO', newVal === 'LIO');
26+
vm.set('isComstar', newVal === 'comstar');
27+
- vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt');
28+
+ vm.set('isFreeNAS', newVal === 'freenas');
29+
+ vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'freenas' || newVal === 'istgt');
30+
+ if (newVal !== 'freenas') {
31+
+ me.lookupReference('freenas_use_ssl_field').setValue(false);
32+
+ me.lookupReference('freenas_apiv4_host_field').setValue('');
33+
+ me.lookupReference('freenas_user_field').setValue('');
34+
+ me.lookupReference('freenas_user_field').allowBlank = true;
35+
+ me.lookupReference('freenas_password_field').setValue('');
36+
+ me.lookupReference('freenas_password_field').allowBlank = true;
37+
+ me.lookupReference('freenas_confirmpw_field').setValue('');
38+
+ me.lookupReference('freenas_confirmpw_field').allowBlank = true;
39+
+ } else {
40+
+ me.lookupReference('freenas_user_field').allowBlank = false;
41+
+ me.lookupReference('freenas_password_field').allowBlank = false;
42+
+ me.lookupReference('freenas_confirmpw_field').allowBlank = false;
43+
+ }
44+
},
45+
},
46+
47+
@@ -47400,6 +47418,7 @@
48+
},
49+
50+
setValues: function(values) {
51+
+ values.freenas_confirmpw = values.freenas_password;
52+
values.writecache = values.nowritecache ? 0 : 1;
53+
this.callParent([values]);
54+
},
55+
@@ -47416,7 +47435,7 @@
56+
allowBlank: false,
57+
},
58+
{
59+
- xtype: me.isCreate ? 'textfield' : 'displayfield',
60+
+ xtype: 'textfield',
61+
name: 'pool',
62+
value: '',
63+
fieldLabel: gettext('Pool'),
64+
@@ -47426,11 +47445,11 @@
65+
xtype: me.isCreate ? 'textfield' : 'displayfield',
66+
name: 'blocksize',
67+
value: '4k',
68+
- fieldLabel: gettext('Block Size'),
69+
+ fieldLabel: gettext('ZFS Block Size'),
70+
allowBlank: false,
71+
},
72+
{
73+
- xtype: me.isCreate ? 'textfield' : 'displayfield',
74+
+ xtype: 'textfield',
75+
name: 'target',
76+
value: '',
77+
fieldLabel: gettext('Target'),
78+
@@ -47441,9 +47460,34 @@
79+
name: 'comstar_tg',
80+
value: '',
81+
fieldLabel: gettext('Target group'),
82+
- bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
83+
+ bind: {
84+
+ hidden: '{!isComstar}'
85+
+ },
86+
allowBlank: true,
87+
},
88+
+ {
89+
+ xtype: 'proxmoxcheckbox',
90+
+ name: 'freenas_use_ssl',
91+
+ reference: 'freenas_use_ssl_field',
92+
+ inputId: 'freenas_use_ssl_field',
93+
+ checked: false,
94+
+ bind: {
95+
+ hidden: '{!isFreeNAS}'
96+
+ },
97+
+ uncheckedValue: 0,
98+
+ fieldLabel: gettext('API use SSL'),
99+
+ },
100+
+ {
101+
+ xtype: 'textfield',
102+
+ name: 'freenas_user',
103+
+ reference: 'freenas_user_field',
104+
+ inputId: 'freenas_user_field',
105+
+ value: '',
106+
+ fieldLabel: gettext('API Username'),
107+
+ bind: {
108+
+ hidden: '{!isFreeNAS}'
109+
+ },
110+
+ },
111+
];
112+
113+
me.column2 = [
114+
@@ -47473,7 +47517,9 @@
115+
xtype: me.isCreate ? 'textfield' : 'displayfield',
116+
name: 'comstar_hg',
117+
value: '',
118+
- bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
119+
+ bind: {
120+
+ hidden: '{!isComstar}'
121+
+ },
122+
fieldLabel: gettext('Host group'),
123+
allowBlank: true,
124+
},
125+
@@ -47481,9 +47527,62 @@
126+
xtype: me.isCreate ? 'textfield' : 'displayfield',
127+
name: 'lio_tpg',
128+
value: '',
129+
- bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' },
130+
- allowBlank: false,
131+
+ bind: {
132+
+ hidden: '{!isLIO}'
133+
+ },
134+
fieldLabel: gettext('Target portal group'),
135+
+ allowBlank: true
136+
+ },
137+
+ {
138+
+ xtype: 'proxmoxtextfield',
139+
+ name: 'freenas_apiv4_host',
140+
+ reference: 'freenas_apiv4_host_field',
141+
+ value: '',
142+
+ editable: true,
143+
+ emptyText: Proxmox.Utils.noneText,
144+
+ bind: {
145+
+ hidden: '{!isFreeNAS}'
146+
+ },
147+
+ fieldLabel: gettext('API IPv4 Host'),
148+
+ },
149+
+ {
150+
+ xtype: 'proxmoxtextfield',
151+
+ name: 'freenas_password',
152+
+ reference: 'freenas_password_field',
153+
+ inputType: me.isCreate ? '' : 'password',
154+
+ value: '',
155+
+ editable: true,
156+
+ emptyText: Proxmox.Utils.noneText,
157+
+ bind: {
158+
+ hidden: '{!isFreeNAS}'
159+
+ },
160+
+ fieldLabel: gettext('API Password'),
161+
+ change: function(f, value) {
162+
+ if (f.rendered) {
163+
+ f.up().down('field[name=freenas_confirmpw]').validate();
164+
+ }
165+
+ },
166+
+ },
167+
+ {
168+
+ xtype: 'proxmoxtextfield',
169+
+ name: 'freenas_confirmpw',
170+
+ reference: 'freenas_confirmpw_field',
171+
+ inputType: me.isCreate ? '' : 'password',
172+
+ value: '',
173+
+ editable: true,
174+
+ submitValue: false,
175+
+ emptyText: Proxmox.Utils.noneText,
176+
+ bind: {
177+
+ hidden: '{!isFreeNAS}'
178+
+ },
179+
+ fieldLabel: gettext('Confirm Password'),
180+
+ validator: function(value) {
181+
+ var pw = this.up().down('field[name=freenas_password]').getValue();
182+
+ if (pw !== value) {
183+
+ return "Passwords do not match!";
184+
+ }
185+
+ return true;
186+
+ },
187+
},
188+
];
189+

‎pve-manager/js/pvemanagerlib.js.patch

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
--- pvemanagerlib.js.orig 2021-03-09 02:22:47.000000000 -0500
2-
+++ pvemanagerlib.js 2021-03-20 11:52:39.694828636 -0400
3-
@@ -7849,6 +7849,7 @@
1+
--- pvemanagerlib.js.orig 2021-05-27 08:28:35.000000000 -0400
2+
+++ pvemanagerlib.js 2021-06-10 11:03:15.380175988 -0400
3+
@@ -7900,6 +7900,7 @@
44
alias: ['widget.pveiScsiProviderSelector'],
55
comboItems: [
66
['comstar', 'Comstar'],
77
+ ['freenas', 'FreeNAS-API'],
88
['istgt', 'istgt'],
99
['iet', 'IET'],
1010
['LIO', 'LIO'],
11-
@@ -46874,6 +46875,7 @@
11+
@@ -47367,6 +47368,7 @@
1212
data: {
1313
isLIO: false,
1414
isComstar: true,
1515
+ isFreeNAS: false,
1616
hasWriteCacheOption: true,
1717
},
1818
},
19-
@@ -46886,10 +46888,26 @@
19+
@@ -47379,10 +47381,26 @@
2020
},
2121
},
2222
changeISCSIProvider: function(f, newVal, oldVal) {
@@ -44,15 +44,15 @@
4444
},
4545
},
4646

47-
@@ -46907,6 +46925,7 @@
47+
@@ -47400,6 +47418,7 @@
4848
},
4949

50-
setValues: function diff(values) {
51-
+ values.freenas_confirmpw = values.freenas_password;
50+
setValues: function(values) {
51+
+ values.freenas_confirmpw = values.freenas_password;
5252
values.writecache = values.nowritecache ? 0 : 1;
5353
this.callParent([values]);
5454
},
55-
@@ -46923,7 +46942,7 @@
55+
@@ -47416,7 +47435,7 @@
5656
allowBlank: false,
5757
},
5858
{
@@ -61,7 +61,7 @@
6161
name: 'pool',
6262
value: '',
6363
fieldLabel: gettext('Pool'),
64-
@@ -46933,11 +46952,11 @@
64+
@@ -47426,11 +47445,11 @@
6565
xtype: me.isCreate ? 'textfield' : 'displayfield',
6666
name: 'blocksize',
6767
value: '4k',
@@ -75,7 +75,7 @@
7575
name: 'target',
7676
value: '',
7777
fieldLabel: gettext('Target'),
78-
@@ -46948,9 +46967,34 @@
78+
@@ -47441,9 +47460,34 @@
7979
name: 'comstar_tg',
8080
value: '',
8181
fieldLabel: gettext('Target group'),
@@ -111,7 +111,7 @@
111111
];
112112

113113
me.column2 = [
114-
@@ -46980,7 +47024,9 @@
114+
@@ -47473,7 +47517,9 @@
115115
xtype: me.isCreate ? 'textfield' : 'displayfield',
116116
name: 'comstar_hg',
117117
value: '',
@@ -122,7 +122,7 @@
122122
fieldLabel: gettext('Host group'),
123123
allowBlank: true,
124124
},
125-
@@ -46988,9 +47034,62 @@
125+
@@ -47481,9 +47527,62 @@
126126
xtype: me.isCreate ? 'textfield' : 'displayfield',
127127
name: 'lio_tpg',
128128
value: '',

0 commit comments

Comments
 (0)