From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@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 2E5DD707CE
for <pve-devel@lists.proxmox.com>; Mon, 6 Sep 2021 12:19:14 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 2C628F4DA
for <pve-devel@lists.proxmox.com>; Mon, 6 Sep 2021 12:19:14 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id BC170F4CE
for <pve-devel@lists.proxmox.com>; Mon, 6 Sep 2021 12:19:09 +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 8E3F5445BC
for <pve-devel@lists.proxmox.com>; Mon, 6 Sep 2021 12:19:09 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 6 Sep 2021 12:19:08 +0200
Message-Id: <20210906101908.2155602-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.446 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
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: [pve-devel] [PATCH manager] ui: add version to extjs script urls
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: Mon, 06 Sep 2021 10:19:14 -0000
so that we circumvent browsers caching 6.0 extjs js/css
also depend on extjs 7.0.0 in debian control
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
this should (at least for new users upgrading) fix the browser caching
issue for extjs (we had some now in the forums)
i did it this way since we do not often change version of the extjs
package (since its a big task everytime anyway), but if wanted i can
do it differently. e.g.:
* hardcode it in the perl code
* generate it during the build (also for the control file)
but imho this is fine for extjs
debian/control | 2 +-
www/index.html.tpl | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/debian/control b/debian/control
index ce0a54c7..7b4e1b3c 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Depends: apt-transport-https | apt (>= 1.5~),
libcrypt-ssleay-perl,
libfile-readbackwards-perl,
libfilesys-df-perl,
- libjs-extjs (>= 6.0.1),
+ libjs-extjs (>= 7.0.0),
libjson-perl,
liblwp-protocol-https-perl,
libnet-dns-perl,
diff --git a/www/index.html.tpl b/www/index.html.tpl
index fd087799..7f07ea18 100644
--- a/www/index.html.tpl
+++ b/www/index.html.tpl
@@ -7,8 +7,8 @@
<title>[% nodename %] - Proxmox Virtual Environment</title>
<link rel="icon" sizes="128x128" href="/pve2/images/logo-128.png" />
<link rel="apple-touch-icon" sizes="128x128" href="/pve2/images/logo-128.png" />
- <link rel="stylesheet" type="text/css" href="/pve2/ext6/theme-crisp/resources/theme-crisp-all.css" />
- <link rel="stylesheet" type="text/css" href="/pve2/ext6/crisp/resources/charts-all.css" />
+ <link rel="stylesheet" type="text/css" href="/pve2/ext6/theme-crisp/resources/theme-crisp-all.css?ver=7.0.0" />
+ <link rel="stylesheet" type="text/css" href="/pve2/ext6/crisp/resources/charts-all.css?ver=7.0.0" />
<link rel="stylesheet" type="text/css" href="/pve2/fa/css/font-awesome.css" />
<link rel="stylesheet" type="text/css" href="/pve2/css/ext6-pve.css?ver=[% version %]" />
<link rel="stylesheet" type="text/css" href="/pwt/css/ext6-pmx.css?ver=[% wtversion %]" />
@@ -18,11 +18,11 @@
<script type='text/javascript'>function gettext(buf) { return buf; }</script>
[% END %]
[%- IF debug %]
- <script type="text/javascript" src="/pve2/ext6/ext-all-debug.js"></script>
- <script type="text/javascript" src="/pve2/ext6/charts-debug.js"></script>
+ <script type="text/javascript" src="/pve2/ext6/ext-all-debug.js?ver=7.0.0"></script>
+ <script type="text/javascript" src="/pve2/ext6/charts-debug.js?ver=7.0.0"></script>
[%- ELSE %]
- <script type="text/javascript" src="/pve2/ext6/ext-all.js"></script>
- <script type="text/javascript" src="/pve2/ext6/charts.js"></script>
+ <script type="text/javascript" src="/pve2/ext6/ext-all.js?ver=7.0.0"></script>
+ <script type="text/javascript" src="/pve2/ext6/charts.js?ver=7.0.0"></script>
[% END %]
<script type="text/javascript" src="/pve2/js/u2f-api.js"></script>
<script type="text/javascript" src="/pve2/js/qrcode.min.js"></script>
@@ -36,7 +36,7 @@
</script>
<script type="text/javascript" src="/proxmoxlib.js?ver=[% wtversion %]"></script>
<script type="text/javascript" src="/pve2/js/pvemanagerlib.js?ver=[% version %]"></script>
- <script type="text/javascript" src="/pve2/ext6/locale/locale-[% lang %].js"></script>
+ <script type="text/javascript" src="/pve2/ext6/locale/locale-[% lang %].js?ver=7.0.0"></script>
<script type="text/javascript">
if (typeof(PVE) === 'undefined') PVE = {};
--
2.30.2