From 3671586cc37c1f5d36383cfeaa73f073d9bef4ba Mon Sep 17 00:00:00 2001 From: Michel F <80367602+MrWaloo@users.noreply.github.com> Date: Tue, 7 Apr 2026 12:41:06 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Options=20de=20mise=20=C3=A0=20jour=20:=20l?= =?UTF-8?q?ien=20vers=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop/php/update.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/desktop/php/update.php b/desktop/php/update.php index 5d7295083a..0c6ee56496 100644 --- a/desktop/php/update.php +++ b/desktop/php/update.php @@ -38,6 +38,7 @@ } else { sendVarToJS('jeephp2js.isUpdating', '1'); } +$changelog_url = config::byKey('doc::base_url', 'core') . '/' . config::byKey('language', 'core', 'fr_FR') . '/core/' . substr(jeedom::version(), 0, 3) . '/changelog'; ?>
@@ -49,7 +50,7 @@ {{Vérifier les mises à jour}} {{Sauvegarder}} {{Mettre à jour}} - +


@@ -127,7 +128,11 @@
- {{Avant toute mise à jour, merci de consulter le}} {{changelog}} {{du Core}}. + {{Avant toute mise à jour, merci de consulter le}} + + {{Changelog}} + + {{du Core}}.
From 1e9990833d9b7a8d13e4fb74f8f43b517a17526c Mon Sep 17 00:00:00 2001 From: Michel F <80367602+MrWaloo@users.noreply.github.com> Date: Wed, 8 Apr 2026 00:33:23 +0200 Subject: [PATCH 2/2] construction du lien vers le changelog correcte --- core/ajax/jeedom.ajax.php | 3 +++ core/js/jeedom.class.js | 1 + desktop/js/update.js | 18 ++++++++++++++++++ desktop/php/update.php | 3 +-- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/core/ajax/jeedom.ajax.php b/core/ajax/jeedom.ajax.php index efa538d3fe..fbbc42d6c9 100644 --- a/core/ajax/jeedom.ajax.php +++ b/core/ajax/jeedom.ajax.php @@ -115,6 +115,9 @@ $page = 'administration'; } $version = substr(jeedom::version(), 0, 3); + if (init('remoteVersion') != '') { + $version = substr(init('remoteVersion'), 0, 3); + } ajax::success(config::byKey('doc::base_url', 'core') . '/' . config::byKey('language', 'core', 'fr_FR') . '/core/' . $version . '/' . secureXSS($page) . '?theme=' . $theme); } throw new Exception(__('Aucune documentation trouvée', __FILE__), -1234); diff --git a/core/js/jeedom.class.js b/core/js/jeedom.class.js index d8b6e26014..5d79b1077c 100644 --- a/core/js/jeedom.class.js +++ b/core/js/jeedom.class.js @@ -756,6 +756,7 @@ jeedom.getDocumentationUrl = function(_params) { plugin: params.plugin || null, page: params.page || null, theme: params.theme || null, + remoteVersion: params.remoteVersion || null, } domUtils.ajax(paramsAJAX) } diff --git a/desktop/js/update.js b/desktop/js/update.js index 2da798747a..f80ceba932 100644 --- a/desktop/js/update.js +++ b/desktop/js/update.js @@ -561,6 +561,24 @@ if (!jeeFrontEnd.update) { check_backupBefore.removeAttribute('disabled') } }) + + contentEl.querySelector('#bt_changelogCore').addEventListener('click', function(event) { + jeedom.getDocumentationUrl({ + page: 'changelog', + theme: document.body.getAttribute('data-theme'), + remoteVersion: document.querySelector('tr[data-logicalid="jeedom"] [data-l1key="remoteVersion"]').textContent, + error: function(error) { + jeedomUtils.showAlert({ + attachTo: jeeDialog.get('#md_specifyUpdate', 'dialog'), + message: error.message, + level: 'danger' + }) + }, + success: function(url) { + window.open(url, '_blank') + } + }) + }) }, onShown: function() { jeeDialog.get('#md_update', 'content').querySelector('#md_specifyUpdate').removeClass('hidden') diff --git a/desktop/php/update.php b/desktop/php/update.php index 0c6ee56496..47400a9817 100644 --- a/desktop/php/update.php +++ b/desktop/php/update.php @@ -38,7 +38,6 @@ } else { sendVarToJS('jeephp2js.isUpdating', '1'); } -$changelog_url = config::byKey('doc::base_url', 'core') . '/' . config::byKey('language', 'core', 'fr_FR') . '/core/' . substr(jeedom::version(), 0, 3) . '/changelog'; ?>
@@ -129,7 +128,7 @@
{{Avant toute mise à jour, merci de consulter le}} - + {{Changelog}} {{du Core}}.