kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues 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

17
public/viewjs/productform.js
View File

@ -21,10 +21,18 @@
window.close(); window.close();
} }
else if (returnTo !== undefined) else if (returnTo !== undefined)
{
if (GetUriParam("flow") !== undefined)
{ {
window.location.href = U(returnTo) + '&product-name=' + encodeURIComponent($('#name').val()); window.location.href = U(returnTo) + '&product-name=' + encodeURIComponent($('#name').val());
} }
else else
{
window.location.href = U(returnTo);
}
}
else
{ {
window.location.href = U(location + productId); window.location.href = U(location + productId);
} }
@ -51,10 +59,17 @@
window.close(); window.close();
} }
else if (returnTo !== undefined) else if (returnTo !== undefined)
{
if (GetUriParam("flow") !== undefined)
{ {
window.location.href = U(returnTo) + '&product-name=' + encodeURIComponent($('#name').val()); window.location.href = U(returnTo) + '&product-name=' + encodeURIComponent($('#name').val());
} }
else else
{
window.location.href = U(returnTo);
}
}
else
{ {
window.location.href = U(location + productId); window.location.href = U(location + productId);
} }
@ -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");