Skip to content

Options de mise à jour : lien vers changelog #3247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrWaloo wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Options de mise à jour : lien vers changelog #3247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5e6758
Merge pull request #3231 from jeedom/4.5.3
Salvialf Mar 31, 2026
3671586
Options de mise à jour : lien vers changelog
MrWaloo Apr 7, 2026
1e99908
construction du lien vers le changelog correcte
MrWaloo Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/ajax/jeedom.ajax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions core/js/jeedom.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
18 changes: 18 additions & 0 deletions desktop/js/update.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
8 changes: 6 additions & 2 deletions desktop/php/update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<a class="btn btn-info btn-sm roundedLeft" id="bt_checkAllUpdate"><i class="fas fa-sync"></i> {{Vérifier les mises à jour}}
</a><a class="btn btn-success btn-sm" id="bt_saveUpdate"><i class="fas fa-check-circle"></i> {{Sauvegarder}}
</a><?php if ($showUpdate == true) { ?><a href="#" class="btn btn-sm btn-warning roundedRight updateJeedom"><i class="fas fa-check"></i> {{Mettre à jour}}
</a><?php } ?>
</a><?php } ?>
</span>
</div>
<br /><br />
Expand Down Expand Up @@ -127,7 +127,11 @@
<form class="form-horizontal">
<fieldset>
<div class="alert alert-warning">
{{Avant toute mise à jour, merci de consulter le}} <span class="bt_changelogCore label cursor alert-info">{{changelog}}</span> {{du Core}}.
{{Avant toute mise à jour, merci de consulter le}}
<a class="btn btn-xs" id="bt_changelogCore" target="_blank"><i class="fas fa-book"></i>
{{Changelog}}
</a>
{{du Core}}.
</div>
<?php if (config::byKey('core::branch') == 'beta' || config::byKey('core::branch') == 'alpha') { ?>
<div class="alert alert-danger">
Expand Down
Loading