[pbs-devel] [PATCH proxmox-backup] ui: fix calendarevent examples

[pbs-devel] [PATCH proxmox-backup] ui: fix calendarevent examples

[Dominik Csapak]

*/x is not valid syntax, also an timespec must at least have
hours and minutes

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/form/CalendarEvent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/form/CalendarEvent.js b/www/form/CalendarEvent.js
index d05136b9..ddc8fa79 100644
--- a/www/form/CalendarEvent.js
+++ b/www/form/CalendarEvent.js
@@ -4,9 +4,9 @@ Ext.define('PBS.data.CalendarEventExamples', {
 
     field: ['value', 'text'],
     data: [
-	{ value: '*/30', text: Ext.String.format(gettext("Every {0} minutes"), 30) },
+	{ value: '*:0/30', text: Ext.String.format(gettext("Every {0} minutes"), 30) },
 	{ value: 'hourly', text: gettext("Every hour") },
-	{ value: '*/2:00', text: gettext("Every two hours") },
+	{ value: '0/2:00', text: gettext("Every two hours") },
 	{ value: '2,22:30', text: gettext("Every day") + " 02:30, 22:30" },
 	{ value: 'daily', text: gettext("Every day") + " 00:00" },
 	{ value: 'mon..fri', text: gettext("Monday to Friday") + " 00:00" },
-- 
2.20.1

Re: [pbs-devel] [PATCH proxmox-backup] ui: fix calendarevent examples

[Thomas Lamprecht]

On 09.09.20 16:17, Dominik Csapak wrote:
> */x is not valid syntax, also an timespec must at least have
> hours and minutes

PVE supports this (and, IIRC, this parser previously too)
https://git.proxmox.com/?p=pve-manager.git;a=blob;f=www/manager6/form/CalendarEvent.js;h=c3b9ecab7e00014bd50533056e4dc9642fdf435a;hb=HEAD

I'd like if those are kept as compatible as possible, it's really
not good if we have two similar looking schedule formats which are
incompatible...

> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  www/form/CalendarEvent.js | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/www/form/CalendarEvent.js b/www/form/CalendarEvent.js
> index d05136b9..ddc8fa79 100644
> --- a/www/form/CalendarEvent.js
> +++ b/www/form/CalendarEvent.js
> @@ -4,9 +4,9 @@ Ext.define('PBS.data.CalendarEventExamples', {
>  
>      field: ['value', 'text'],
>      data: [
> -	{ value: '*/30', text: Ext.String.format(gettext("Every {0} minutes"), 30) },
> +	{ value: '*:0/30', text: Ext.String.format(gettext("Every {0} minutes"), 30) },
>  	{ value: 'hourly', text: gettext("Every hour") },
> -	{ value: '*/2:00', text: gettext("Every two hours") },
> +	{ value: '0/2:00', text: gettext("Every two hours") },
>  	{ value: '2,22:30', text: gettext("Every day") + " 02:30, 22:30" },
>  	{ value: 'daily', text: gettext("Every day") + " 00:00" },
>  	{ value: 'mon..fri', text: gettext("Monday to Friday") + " 00:00" },
>