proxmox-mirrors/proxmox-widget-toolkit
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-widget-toolkit synced 2025-05-03 01:04:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

acme: separate flag to disable the 'domains=' array

Browse Source 
PVE has 2 domain lists, PMG only 1 since it requires the
additional type.

In PBS I do not want to have 2 lists either, since it seems
rather inconvenient to have 2 different ways to access the
same list.

Currently we decide this based on whether we have multiple
certificate types, which in PBS we don't, so we need a
separate option for this.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2021-04-16 15:35:17 +02:00 committed by Thomas Lamprecht
parent 6f9f9c71b3
commit ef7a8290db
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/panel/ACMEDomains.js
View File

@ -21,6 +21,8 @@ Ext.define('Proxmox.panel.ACMEDomains', {
domainUsages: undefined,
// if no domainUsages parameter is supllied, the orderUrl is required instead:
orderUrl: undefined,
// Force the use of 'acmedomainX' properties.
separateDomainEntries: undefined,
acmeUrl: undefined,
@ -87,6 +89,7 @@ Ext.define('Proxmox.panel.ACMEDomains', {
acmeUrl: view.acmeUrl,
nodeconfig: view.nodeconfig,
domainUsages: view.domainUsages,
separateDomainEntries: view.separateDomainEntries,
apiCallDone: function() {
me.reload();
},
@ -105,6 +108,7 @@ Ext.define('Proxmox.panel.ACMEDomains', {
acmeUrl: view.acmeUrl,
nodeconfig: view.nodeconfig,
domainUsages: view.domainUsages,
separateDomainEntries: view.separateDomainEntries,
domain: selection[0].data,
apiCallDone: function() {
me.reload();

5
src/window/ACMEDomains.js
View File

@ -16,6 +16,9 @@ Ext.define('Proxmox.window.ACMEDomainEdit', {
// For PMG the we have multiple certificates, so we have a "usage" attribute & column.
domainUsages: undefined,
// Force the use of 'acmedomainX' properties.
separateDomainEntries: undefined,
cbindData: function(config) {
let me = this;
return {
@ -50,7 +53,7 @@ Ext.define('Proxmox.window.ACMEDomainEdit', {
};
// If we have a 'usage' property (pmg), we only use the `acmedomainX` config keys.
if (win.domainUsages) {
if (win.separateDomainEntries || win.domainUsages) {
if (!configkey || configkey === 'acme') {
configkey = find_free_slot();
}