mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-07-20 12:03:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix manual refresh commit (#2081)

Browse Source 
Commit was performed too early, potentially before the last feeds were
done refreshing
This commit is contained in:
Alexandre Alapetite
2018-10-26 22:18:11 +02:00
committed by GitHub
parent c57aade0f2
commit cae30f010a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
p/scripts/main.js
View File

@@ -927,7 +927,7 @@ function updateFeed(feeds, feeds_count) {
url: feed.url,
data: {
_csrf: context.csrf,
noCommit: feeds.length > 0 ? 1 : 0,
noCommit: 1,
},
}).always(function (data) {
feed_processed++;
@@ -935,7 +935,16 @@ function updateFeed(feeds, feeds_count) {
$("#actualizeProgress .title").html(feed.title);
if (feed_processed === feeds_count) {
window.location.reload();
$.ajax({ //Empty request to commit new articles
type: 'POST',
url: './?c=feed&a=actualize&id=-1&ajax=1',
data: {
_csrf: context.csrf,
noCommit: 0,
},
}).always(function (data) {
window.location.reload();
});
} else {
updateFeed(feeds, feeds_count);
}
@@ -961,7 +970,7 @@ function init_actualize() {
openNotification(data.feedback_no_refresh, "good");
$.ajax({ //Empty request to force refresh server database cache
type: 'POST',
url: './?c=feed&a=actualize&id=-1',
url: './?c=feed&a=actualize&id=-1&ajax=1',
data: {
_csrf: context.csrf,
noCommit: 0,