kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

Changelog and code optimizations for pull request #420

Browse Source
This commit is contained in:
Bernd Bestel
2019-10-19 10:33:46 +02:00
parent a0fc06f6ed
commit da2c8d48ac
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
public/viewjs/productform.js
View File

@@ -49,7 +49,11 @@
Grocy.Api.UploadFile($("#product-picture")[0].files[0], 'productpictures', jsonData.picture_file_name,
function(result)
{
if (redirectDestination == "reload")
if (GetUriParam("closeAfterCreation") !== undefined)
{
window.close();
}
else if (redirectDestination == "reload")
{
window.location.reload();
}
@@ -67,14 +71,11 @@
}
else
{
/* If the GET parameter "closeAfterCreation" was passed to the form, it will
automatically close after creating the product. This only works if the window
was opened with javascript */
if (window.location.href.toLowerCase().includes("closeaftercreation"))
{
window.close();
}
if (redirectDestination == "reload")
if (GetUriParam("closeAfterCreation") !== undefined)
{
window.close();
}
else if (redirectDestination == "reload")
{
window.location.reload();
}
@@ -119,7 +120,11 @@
Grocy.Api.UploadFile($("#product-picture")[0].files[0], 'productpictures', jsonData.picture_file_name,
function(result)
{
if (redirectDestination == "reload")
if (GetUriParam("closeAfterCreation") !== undefined)
{
window.close();
}
else if (redirectDestination == "reload")
{
window.location.reload();
}
@@ -137,7 +142,11 @@
}
else
{
if (redirectDestination == "reload")
if (GetUriParam("closeAfterCreation") !== undefined)
{
window.close();
}
else if (redirectDestination == "reload")
{
window.location.reload();
}