kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-15 10:14:39 +00:00
Code Issues Projects Releases Wiki Activity

Reverted 41067b23bb because that's not needed (references #1049 and #958)

Browse Source
This commit is contained in:
Bernd Bestel
2020-11-17 21:10:26 +01:00
parent 7ef970a09f
commit 639ffe13f5
4 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
public/js/grocy_dbchangedhandling.js
View File

@@ -15,34 +15,31 @@
// Check if the database has changed once a minute
// If a change is detected, reload the current page, but only if already idling for at least 50 seconds,
// when there is no unsaved form data and when the user enabled auto reloading
if (Grocy.DbChangedHandlingEnabledForPage)
setInterval(function()
{
setInterval(function()
{
Grocy.Api.Get('system/db-changed-time',
function(result)
Grocy.Api.Get('system/db-changed-time',
function(result)
{
var newDbChangedTime = moment(result.changed_time);
if (newDbChangedTime.isAfter(Grocy.DatabaseChangedTime))
{
var newDbChangedTime = moment(result.changed_time);
if (newDbChangedTime.isAfter(Grocy.DatabaseChangedTime))
if (Grocy.IdleTime >= 50)
{
if (Grocy.IdleTime >= 50)
if (BoolVal(Grocy.UserSettings.auto_reload_on_db_change) && $("form.is-dirty").length === 0 && !$("body").hasClass("fullscreen-card"))
{
if (BoolVal(Grocy.UserSettings.auto_reload_on_db_change) && $("form.is-dirty").length === 0 && !$("body").hasClass("fullscreen-card"))
{
window.location.reload();
}
window.location.reload();
}
Grocy.DatabaseChangedTime = newDbChangedTime;
}
},
function(xhr)
{
console.error(xhr);
Grocy.DatabaseChangedTime = newDbChangedTime;
}
);
}, 60000);
}
},
function(xhr)
{
console.error(xhr);
}
);
}, 60000);
Grocy.IdleTime = 0;
Grocy.ResetIdleTime = function()