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

Finalize user-defined-fields (closes #176)

Browse Source
This commit is contained in:
Bernd Bestel
2019-04-23 09:06:18 +02:00
parent 72a3f63546
commit c5993ad994
25 changed files with 262 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/viewjs/userfieldform.js
View File

@@ -5,12 +5,18 @@
var jsonData = $('#userfield-form').serializeJSON();
Grocy.FrontendHelpers.BeginUiBusy("userfield-form");
var redirectUrl = U("/userfields");
if (typeof GetUriParam("entity") !== "undefined" && !GetUriParam("entity").isEmpty())
{
redirectUrl = U("/userfields?entity=" + GetUriParam("entity"));
}
if (Grocy.EditMode === 'create')
{
Grocy.Api.Post('objects/userfields', jsonData,
function(result)
{
window.location.href = U('/userfields');
window.location.href = redirectUrl;
},
function(xhr)
{
@@ -24,7 +30,7 @@
Grocy.Api.Put('objects/userfields/' + Grocy.EditObjectId, jsonData,
function(result)
{
window.location.href = U('/userfields');
window.location.href = redirectUrl;
},
function(xhr)
{
@@ -64,7 +70,7 @@ $('#userfield-form input').keydown(function(event)
$('#entity').focus();
if (typeof GetUriParam("entity") !== "undefined")
if (typeof GetUriParam("entity") !== "undefined" && !GetUriParam("entity").isEmpty())
{
$("#entity").val(GetUriParam("entity"));
$("#entity").trigger("change");