From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 624BB20EC8A for ; Tue, 23 Apr 2024 13:53:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DB1EA3045B; Tue, 23 Apr 2024 13:53:10 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Tue, 23 Apr 2024 13:52:15 +0200 Message-Id: <20240423115230.170113-30-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240423115230.170113-1-l.wagner@proxmox.com> References: <20240423115230.170113-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup v5 29/44] ui: tape backup: add selector for 'notification-mode' X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Signed-off-by: Lukas Wagner Tested-by: Gabriel Goller Reviewed-by: Gabriel Goller Tested-by: Maximiliano Sandoval --- www/tape/window/TapeBackup.js | 25 +++++++++++++++++++++++++ www/tape/window/TapeBackupJob.js | 11 ++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/www/tape/window/TapeBackup.js b/www/tape/window/TapeBackup.js index 941b6b83..a8385339 100644 --- a/www/tape/window/TapeBackup.js +++ b/www/tape/window/TapeBackup.js @@ -8,6 +8,15 @@ Ext.define('PBS.TapeManagement.TapeBackupWindow', { showTaskViewer: true, isCreate: true, + viewModel: { + data: { + notificationMode: 'notification-system', + }, + formulas: { + notificationSystemSelected: (get) => get('notificationMode') === 'notification-system', + }, + }, + items: [ { xtype: 'inputpanel', @@ -81,6 +90,19 @@ Ext.define('PBS.TapeManagement.TapeBackupWindow', { name: 'eject-media', fieldLabel: gettext('Eject Media'), }, + { + xtype: 'proxmoxKVComboBox', + labelWidth: 150, + comboItems: [ + ['legacy-sendmail', gettext('Email (legacy)')], + ['notification-system', gettext('Notification system')], + ], + fieldLabel: gettext('Notification mode'), + name: 'notification-mode', + bind: { + value: '{notificationMode}', + }, + }, { xtype: 'pmxUserSelector', labelWidth: 150, @@ -90,6 +112,9 @@ Ext.define('PBS.TapeManagement.TapeBackupWindow', { value: null, allowBlank: true, skipEmptyText: true, + bind: { + disabled: "{notificationSystemSelected}", + }, renderer: Ext.String.htmlEncode, }, ], diff --git a/www/tape/window/TapeBackupJob.js b/www/tape/window/TapeBackupJob.js index 309dda0b..12623712 100644 --- a/www/tape/window/TapeBackupJob.js +++ b/www/tape/window/TapeBackupJob.js @@ -48,13 +48,21 @@ Ext.define('PBS.TapeManagement.BackupJobEdit', { viewModel: { data: { - notificationMode: 'notification-system', + notificationMode: '__default__', }, formulas: { notificationSystemSelected: (get) => get('notificationMode') === 'notification-system', }, }, + initComponent: function() { + let me = this; + // Automatically select the new system for new jobs + let mode = me.isCreate ? "notification-system" : "__default__"; + me.getViewModel().set('notificationMode', mode); + me.callParent(); + }, + items: { xtype: 'tabpanel', bodyPadding: 10, @@ -121,6 +129,7 @@ Ext.define('PBS.TapeManagement.BackupJobEdit', { { xtype: 'proxmoxKVComboBox', comboItems: [ + ['__default__', `${Proxmox.Utils.defaultText} (Email)`], ['legacy-sendmail', gettext('Email (legacy)')], ['notification-system', gettext('Notification system')], ], -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel