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 31587673CF for ; Mon, 9 Nov 2020 16:02:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 27D581845B for ; Mon, 9 Nov 2020 16:01:33 +0100 (CET) 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 3B93818435 for ; Mon, 9 Nov 2020 16:01:32 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0839945FC1 for ; Mon, 9 Nov 2020 16:01:32 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 9 Nov 2020 16:01:26 +0100 Message-Id: <20201109150130.4956-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201109150130.4956-1-d.csapak@proxmox.com> References: <20201109150130.4956-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.392 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 06/10] ui: TaskSummary: move state/types/titles out of the controller 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: , X-List-Received-Date: Mon, 09 Nov 2020 15:02:03 -0000 it seems that under certain circumstances, extjs does not initialize or remove the content from objects in controllers move it to the view, were they always exist Signed-off-by: Dominik Csapak --- www/dashboard/TaskSummary.js | 58 +++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/www/dashboard/TaskSummary.js b/www/dashboard/TaskSummary.js index a9ebec07..c70c4118 100644 --- a/www/dashboard/TaskSummary.js +++ b/www/dashboard/TaskSummary.js @@ -4,31 +4,32 @@ Ext.define('PBS.TaskSummary', { title: gettext('Task Summary'), + states: [ + "", + "error", + "warning", + "ok", + ], + + types: [ + "backup", + "prune", + "garbage_collection", + "sync", + "verify", + ], + + titles: { + "backup": gettext('Backups'), + "prune": gettext('Prunes'), + "garbage_collection": gettext('Garbage collections'), + "sync": gettext('Syncs'), + "verify": gettext('Verify'), + }, + controller: { xclass: 'Ext.app.ViewController', - states: [ - "", - "error", - "warning", - "ok", - ], - - types: [ - "backup", - "prune", - "garbage_collection", - "sync", - "verify", - ], - - titles: { - "backup": gettext('Backups'), - "prune": gettext('Prunes'), - "garbage_collection": gettext('Garbage collections'), - "sync": gettext('Syncs'), - "verify": gettext('Verify'), - }, openTaskList: function(grid, td, cellindex, record, tr, rowindex) { let me = this; @@ -36,8 +37,8 @@ Ext.define('PBS.TaskSummary', { if (cellindex > 0) { let tasklist = view.tasklist; - let state = me.states[cellindex]; - let type = me.types[rowindex]; + let state = view.states[cellindex]; + let type = view.types[rowindex]; let filterParam = { limit: 0, 'statusfilter': state, @@ -137,7 +138,7 @@ Ext.define('PBS.TaskSummary', { tasklist.cidx = cellindex; tasklist.ridx = rowindex; - let task = me.titles[type]; + let task = view.titles[type]; let status = ""; switch (state) { case 'ok': status = gettext("OK"); break; @@ -182,7 +183,8 @@ Ext.define('PBS.TaskSummary', { render_count: function(value, md, record, rowindex, colindex) { let me = this; - let icon = me.render_icon(me.states[colindex], value); + let view = me.getView(); + let icon = me.render_icon(view.states[colindex], value); return `${icon} ${value}`; }, }, @@ -191,8 +193,8 @@ Ext.define('PBS.TaskSummary', { let me = this; let controller = me.getController(); let data = []; - controller.types.forEach((type) => { - source[type].type = controller.titles[type]; + me.types.forEach((type) => { + source[type].type = me.titles[type]; data.push(source[type]); }); me.lookup('grid').getStore().setData(data); -- 2.20.1