kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-07 23:09:48 +00:00
Code Issues Projects Releases Wiki Activity

Persist filters on reload (recipe selection change) on the /recipes page (fixes #1455)

Browse Source
This commit is contained in:
Bernd Bestel 2021-06-27 20:28:12 +02:00
parent 7ab59273da
commit 7133c85deb
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
public/viewjs/recipes.js
View File

@ -48,6 +48,15 @@ if (GetUriParam("search") !== undefined)
}, 50); }, 50);
} }
if (GetUriParam("status") !== undefined)
{
$("#status-filter").val(GetUriParam("status"));
setTimeout(function()
{
$("#status-filter").trigger("change");
}, 50);
}
$("a[data-toggle='tab']").on("shown.bs.tab", function(e) $("a[data-toggle='tab']").on("shown.bs.tab", function(e)
{ {
var tabId = $(e.target).attr("id"); var tabId = $(e.target).attr("id");
@ -60,8 +69,16 @@ $("#search").on("keyup", Delay(function()
recipesTables.search(value).draw(); recipesTables.search(value).draw();
$(".recipe-gallery-item").removeClass("d-none"); if (value.isEmpty())
{
RemoveUriParam("search");
}
else
{
UpdateUriParam("search", value);
}
$(".recipe-gallery-item").removeClass("d-none");
$(".recipe-gallery-item .card-title:not(:contains_case_insensitive(" + value + "))").parent().parent().parent().addClass("d-none"); $(".recipe-gallery-item .card-title:not(:contains_case_insensitive(" + value + "))").parent().parent().parent().addClass("d-none");
}, 200)); }, 200));
@ -99,6 +116,15 @@ $("#status-filter").on("change", function()
$('.recipe-gallery-item').not('.recipe-notenoughinstock').addClass('d-none'); $('.recipe-gallery-item').not('.recipe-notenoughinstock').addClass('d-none');
} }
} }
if (value.isEmpty())
{
RemoveUriParam("status");
}
else
{
UpdateUriParam("status", value);
}
}); });
$(".recipe-delete").on('click', function(e) $(".recipe-delete").on('click', function(e)
@ -236,7 +262,8 @@ recipesTables.on('select', function(e, dt, type, indexes)
var currentRecipeId = location.search.split('recipe=')[1]; var currentRecipeId = location.search.split('recipe=')[1];
if (selectedRecipeId.toString() !== currentRecipeId) if (selectedRecipeId.toString() !== currentRecipeId)
{ {
window.location.href = U('/recipes?recipe=' + selectedRecipeId.toString()); UpdateUriParam("recipe", selectedRecipeId.toString());
window.location.reload();
} }
} }
}); });