From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 38C4262AF2 for ; Tue, 24 Nov 2020 13:16:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2D58CBD38 for ; Tue, 24 Nov 2020 13:16:02 +0100 (CET) Received: from dev.dominic.proxmox.com (212-186-127-178.static.upcbusiness.at [212.186.127.178]) by firstgate.proxmox.com (Proxmox) with ESMTP id 21AB8BD2C for ; Tue, 24 Nov 2020 13:16:01 +0100 (CET) Received: by dev.dominic.proxmox.com (Postfix, from userid 0) id 00345228E4; Tue, 24 Nov 2020 13:16:00 +0100 (CET) From: =?UTF-8?q?Dominic=20J=C3=A4ger?= To: pve-devel@lists.proxmox.com Date: Tue, 24 Nov 2020 13:15:58 +0100 Message-Id: <20201124121558.49566-1-d.jaeger@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.377 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 KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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 manager] storage: base edit: Don't send delete during creation X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2020 12:16:02 -0000 ... as this is now allowed by the API (createSchema() in PVE::SectionConfig). It is only allowed by the update API call (updateSchema()). Signed-off-by: Dominic Jäger --- www/manager6/storage/Base.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/www/manager6/storage/Base.js b/www/manager6/storage/Base.js index 79b4a618..21ab3a41 100644 --- a/www/manager6/storage/Base.js +++ b/www/manager6/storage/Base.js @@ -67,17 +67,22 @@ Ext.define('PVE.panel.StoragePruneInputPanel', { let retention = PVE.Parser.printPropertyString(formValues) // always delete old 'maxfiles', we map it to keep-last on edit win load if (retention === '') { - return { - delete: [ - 'prune-backups', - 'maxfiles', - ], - }; + if (this.isCreate) { + return {}; + } else { + return { + delete: [ + 'prune-backups', + 'maxfiles', + ], + }; + } } - return { - 'prune-backups': retention, - delete: 'maxfiles', + let options = { 'prune-backups': retention }; + if (!this.isCreate) { + options.delete = 'maxfiles'; } + return options; }, listeners: { -- 2.20.1