From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dcsapak@zita.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id A287160BB6
for <pve-devel@lists.proxmox.com>; Thu, 10 Sep 2020 14:57:14 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 6EFD41C56E
for <pve-devel@lists.proxmox.com>; Thu, 10 Sep 2020 14:57:14 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[212.186.127.180])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id E004B1C53F
for <pve-devel@lists.proxmox.com>; Thu, 10 Sep 2020 14:57:12 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9FE4044B03
for <pve-devel@lists.proxmox.com>; Thu, 10 Sep 2020 14:57:12 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Thu, 10 Sep 2020 14:57:08 +0200
Message-Id: <20200910125711.28369-3-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200910125711.28369-1-d.csapak@proxmox.com>
References: <20200910125711.28369-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.124 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
methods
NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records
RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/,
medium trust
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_NONE 0.001 SPF: sender does not publish an SPF Record
Subject: [pve-devel] [PATCH RFC manager 1/2] ui: adapt/optimize calendar
event examples
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 10 Sep 2020 12:57:14 -0000
pbs cannot parse minutes alone
(if the hours would be optional it would be ambiguies between hh:mm and mm:ss)
so we adapt the examples here, so that newly created schedules from the
examples include always the hour
also replace */x with 0/x. they are semantically the same, but the
latter is also valid in systemd, while the former is not
also reduce the */1 to * since the /1 does not do anything
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/manager6/form/CalendarEvent.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/www/manager6/form/CalendarEvent.js b/www/manager6/form/CalendarEvent.js
index c3b9ecab..1cb8d492 100644
--- a/www/manager6/form/CalendarEvent.js
+++ b/www/manager6/form/CalendarEvent.js
@@ -11,11 +11,11 @@ Ext.define('PVE.form.CalendarEvent', {
store: {
field: [ 'value', 'text'],
data: [
- { value: '*/30', text: Ext.String.format(gettext("Every {0} minutes"), 30) },
- { value: '*/2:00', text: gettext("Every two hours")},
+ { value: '*:00/30', text: Ext.String.format(gettext("Every {0} minutes"), 30) },
+ { value: '00/2:00', text: gettext("Every two hours")},
{ value: '2,22:30', text: gettext("Every day") + " 02:30, 22:30"},
{ value: 'mon..fri', text: gettext("Monday to Friday") + " 00:00"},
- { value: 'mon..fri */1:00', text: gettext("Monday to Friday") + ': ' + gettext("hourly")},
+ { value: 'mon..fri *:00', text: gettext("Monday to Friday") + ': ' + gettext("hourly")},
{ value: 'sun 01:00', text: gettext("Sunday") + " 01:00"}
]
},
--
2.20.1