Re: [pve-devel] [PATCH manager v5 04/16] ui: dc: backup: allow to set custom job id in advanced settings

2024-04-19 Thread Lukas Wagner



On  2024-04-19 12:31, Fiona Ebner wrote:
> Am 15.04.24 um 10:26 schrieb Lukas Wagner:
>> This might be useful if somebody wants to match on the new
>> 'backup-job' field in a notification match rule.
>>
>> Signed-off-by: Lukas Wagner 
>> ---
>>  www/manager6/Utils.js |  4 
>>  www/manager6/dc/Backup.js | 11 +++
>>  2 files changed, 15 insertions(+)
>>
>> diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
>> index 287d651a..d4b5f3e6 100644
>> --- a/www/manager6/Utils.js
>> +++ b/www/manager6/Utils.js
>> @@ -1952,6 +1952,10 @@ Ext.define('PVE.Utils', {
>>  singleton: true,
>>  constructor: function() {
>>  var me = this;
>> +
>> +// Same regex as 'pve-configid
>> +me.CONFIGID_RE = /^[A-Za-z][A-Za-z0-9_-]+$/;
> 
> This already exists (with nice verification errors), by using
> vtype: 'ConfigId'
> for the field. It's defined in widget-toolkit, Toolkit.js
> 

Fixed, thanks!

-- 
- Lukas


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel



Re: [pve-devel] [PATCH manager v5 04/16] ui: dc: backup: allow to set custom job id in advanced settings

2024-04-19 Thread Fiona Ebner
Am 15.04.24 um 10:26 schrieb Lukas Wagner:
> This might be useful if somebody wants to match on the new
> 'backup-job' field in a notification match rule.
> 
> Signed-off-by: Lukas Wagner 
> ---
>  www/manager6/Utils.js |  4 
>  www/manager6/dc/Backup.js | 11 +++
>  2 files changed, 15 insertions(+)
> 
> diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
> index 287d651a..d4b5f3e6 100644
> --- a/www/manager6/Utils.js
> +++ b/www/manager6/Utils.js
> @@ -1952,6 +1952,10 @@ Ext.define('PVE.Utils', {
>  singleton: true,
>  constructor: function() {
>   var me = this;
> +
> + // Same regex as 'pve-configid
> + me.CONFIGID_RE = /^[A-Za-z][A-Za-z0-9_-]+$/;

This already exists (with nice verification errors), by using
vtype: 'ConfigId'
for the field. It's defined in widget-toolkit, Toolkit.js

> +
>   Ext.apply(me, me.utilities);
>  
>   Proxmox.Utils.override_task_descriptions({
> diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js
> index 4beb84c0..5b6f6688 100644
> --- a/www/manager6/dc/Backup.js
> +++ b/www/manager6/dc/Backup.js
> @@ -397,6 +397,17 @@ Ext.define('PVE.dc.BackupEdit', {
>   },
>   ],
>   advancedColumn1: [
> + {
> + xtype: 'pmxDisplayEditField',
> + fieldLabel: gettext('Job ID'),
> + emptyText: gettext('Autogenerate'),
> + name: 'id',
> + allowBlank: true,
> + regex: PVE.Utils.CONFIGID_RE,
> + cbind: {
> + editable: '{isCreate}',
> + },
> + },
>   {
>   xtype: 'proxmoxcheckbox',
>   fieldLabel: gettext('Repeat missed'),


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel



Re: [pve-devel] [PATCH manager v5 04/16] ui: dc: backup: allow to set custom job id in advanced settings

2024-04-19 Thread Fiona Ebner
Am 15.04.24 um 10:26 schrieb Lukas Wagner:
> This might be useful if somebody wants to match on the new
> 'backup-job' field in a notification match rule.
> 
> Signed-off-by: Lukas Wagner 

Needs a rebase, because the advanced settings were moved to a new
"Advanced" tab.


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel