public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 11:55:56 +00:00
Code Issues Releases Wiki Activity

Default to null 'rv' for plugin update check.

Browse Source 
Previously 'rv' was returned as an empty JS array, causing 'p.rv.git_status != 0' to evaluate to true and a misleading 'Ready to update' appearing for certain plugins.
This commit is contained in:
wn_
2021-03-08 15:38:52 +00:00
parent 28dd255c30
commit fed5158ec5
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
js/PrefHelpers.js
View File

@@ -697,28 +697,30 @@ const Helpers = {
} else {
reply.forEach((p) => {
if (p.rv.need_update) {
dialog.plugins_to_update.push(p.plugin);
if (p.rv) {
if (p.rv.need_update) {
dialog.plugins_to_update.push(p.plugin);
const update_button = dijit.getEnclosingWidget(
App.find(`*[data-update-btn-for-plugin="${p.plugin}"]`));
const update_button = dijit.getEnclosingWidget(
App.find(`*[data-update-btn-for-plugin="${p.plugin}"]`));
if (update_button)
update_button.domNode.show();
}
if (update_button)
update_button.domNode.show();
}
if (p.rv.need_update || p.rv.git_status != 0) {
container.innerHTML +=
`
<li><h3>${p.plugin}</h3>
${p.rv.stderr ? `<pre class="small text-error pre-wrap">${p.rv.stderr}</pre>` : ''}
${p.rv.stdout ? `<pre class="small text-success pre-wrap">${p.rv.stdout}</pre>` : ''}
<div class="small">
${p.rv.git_status ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.git_status) :
App.FormFields.icon("check") + " " + __("Ready to update")}
</div>
</li>
`
if (p.rv.need_update || p.rv.git_status != 0) {
container.innerHTML +=
`
<li><h3>${p.plugin}</h3>
${p.rv.stderr ? `<pre class="small text-error pre-wrap">${p.rv.stderr}</pre>` : ''}
${p.rv.stdout ? `<pre class="small text-success pre-wrap">${p.rv.stdout}</pre>` : ''}
<div class="small">
${p.rv.git_status ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.git_status) :
App.FormFields.icon("check") + " " + __("Ready to update")}
</div>
</li>
`
}
}
dialog.checkNextPlugin();
});