github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-07 13:26:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed product edit page returnto handling

Browse Source
This commit is contained in:
Bernd Bestel 2020-11-14 11:49:46 +01:00
parent c00411da81
commit 1fbda392c2
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
public/viewjs/productform.js
View File

@ -22,7 +22,15 @@
} }
else if (returnTo !== undefined) else if (returnTo !== undefined)
{ {
window.location.href = U(returnTo) + '&product-name=' + encodeURIComponent($('#name').val()); if (GetUriParam("flow") !== undefined)
{
window.location.href = U(returnTo) + '&product-name=' + encodeURIComponent($('#name').val());
}
else
{
window.location.href = U(returnTo);
}
} }
else else
{ {
@ -52,7 +60,14 @@
} }
else if (returnTo !== undefined) else if (returnTo !== undefined)
{ {
window.location.href = U(returnTo) + '&product-name=' + encodeURIComponent($('#name').val()); if (GetUriParam("flow") !== undefined)
{
window.location.href = U(returnTo) + '&product-name=' + encodeURIComponent($('#name').val());
}
else
{
window.location.href = U(returnTo);
}
} }
else else
{ {
@ -147,7 +162,7 @@ if (GetUriParam("flow") == "InplaceNewProductWithName")
$('#name').focus(); $('#name').focus();
} }
if (GetUriParam("flow") !== undefined) if (GetUriParam("flow") !== undefined || GetUriParam("returnto") !== undefined)
{ {
$("#save-hint").addClass("d-none"); $("#save-hint").addClass("d-none");
$(".save-product-button[data-location='return']").addClass("d-none"); $(".save-product-button[data-location='return']").addClass("d-none");