Skip to content
Snippets Groups Projects
Commit 28d6ea45 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

fix ObjectTree

parent 87b5cc90
No related branches found
No related tags found
No related merge requests found
...@@ -4,10 +4,10 @@ import("system.vars"); ...@@ -4,10 +4,10 @@ import("system.vars");
if (vars.exists("$sys.selection") && vars.get("$sys.selection")) if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
{ {
var selectedRows = JSON.parse(vars.get("$sys.selection")); var selectedRows = JSON.parse(vars.getString("$sys.selection"));
var uid = JSON.parse(selectedRows[0]); var uid = JSON.parse(selectedRows[0]);
var isObjectRelationNode = typeof uid[2] == "string"; var isObjectRelationNode = typeof uid[2] == "string";
if (isObjectRelationNode) if (isObjectRelationNode)
{ {
var params = { var params = {
......
...@@ -4,9 +4,10 @@ import("system.vars"); ...@@ -4,9 +4,10 @@ import("system.vars");
if (vars.exists("$sys.selection") && vars.get("$sys.selection")) if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
{ {
var selectedRows = JSON.parse(vars.get("$sys.selection")); var selectedRows = JSON.parse(vars.getString("$sys.selection"));
var isObjectRelationNode = false; var isObjectRelationNode = false;
if (selectedRows.length > 0)
if (selectedRows.length > 0 && selectedRows[0] && selectedRows[0].length > 0 && selectedRows[0][0] == "[")
{ {
var uid = JSON.parse(selectedRows[0]); var uid = JSON.parse(selectedRows[0]);
isObjectRelationNode = typeof uid[2] == "string"; isObjectRelationNode = typeof uid[2] == "string";
......
...@@ -2,32 +2,35 @@ import("system.result"); ...@@ -2,32 +2,35 @@ import("system.result");
import("system.neon"); import("system.neon");
import("system.vars"); import("system.vars");
if (vars.exists("$sys.selection") && vars.get("$sys.selection")) if (!(vars.exists("$param.Uid_param") && vars.get("$param.Uid_param")) && !(vars.exists("$local.idvalues") && vars.get("$local.idvalues") && vars.get("$local.idvalues").length > 0))
{ {
var selectedRows = JSON.parse(vars.get("$sys.selection")); if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
var isObjectRelationNode = false; {
if (selectedRows.length > 0) var selectedRows = JSON.parse(vars.getString("$sys.selection"));
{ var isObjectRelationNode = false;
var uid = JSON.parse(selectedRows[0]); if (selectedRows.length > 0)
isObjectRelationNode = typeof uid[2] == "string";
if (isObjectRelationNode)
{ {
parentId = uid[0]; var uid = JSON.parse(selectedRows[0]);
parentObjectType = uid[3]; isObjectRelationNode = typeof uid[2] == "string";
}
else
{
parentId = vars.getString("$param.ObjectId_param");
parentObjectType = vars.getString("$param.ObjectType_param");
}
var params = { if (isObjectRelationNode)
"ObjectId_param" : parentId, {
"ObjectType_param" : parentObjectType, parentId = uid[0];
"RelationType_param" : vars.get("$field.OBJECTRELATIONTYPEID") parentObjectType = uid[3];
}; }
else
{
parentId = vars.getString("$param.ObjectId_param");
parentObjectType = vars.getString("$param.ObjectType_param");
}
neon.openContext("ObjectTree", "ObjectTreeEdit_view", null, neon.OPERATINGSTATE_NEW, params); var params = {
"ObjectId_param" : parentId,
"ObjectType_param" : parentObjectType,
"RelationType_param" : vars.get("$field.OBJECTRELATIONTYPEID")
};
neon.openContext("ObjectTree", "ObjectTreeEdit_view", null, neon.OPERATINGSTATE_NEW, params);
}
} }
} }
\ No newline at end of file
...@@ -5,9 +5,10 @@ import("system.neon"); ...@@ -5,9 +5,10 @@ import("system.neon");
if (vars.exists("$sys.selection") && vars.get("$sys.selection")) if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
{ {
var selectedRows = JSON.parse(vars.get("$sys.selection")); var selectedRows = JSON.parse(vars.getString("$sys.selection"));
var isObjectRelationNode = false; var isObjectRelationNode = false;
if (selectedRows.length > 0)
if (selectedRows.length > 0 && selectedRows[0] && selectedRows[0].length > 0 && selectedRows[0][0] == "[")
{ {
var uid = JSON.parse(selectedRows[0]); var uid = JSON.parse(selectedRows[0]);
isObjectRelationNode = typeof uid[2] == "string"; isObjectRelationNode = typeof uid[2] == "string";
...@@ -23,4 +24,4 @@ if (vars.exists("$sys.selection") && vars.get("$sys.selection")) ...@@ -23,4 +24,4 @@ if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
result.string(neon.COMPONENTSTATE_DISABLED); result.string(neon.COMPONENTSTATE_DISABLED);
} }
else else
result.string(neon.COMPONENTSTATE_DISABLED); result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
...@@ -43,9 +43,12 @@ else ...@@ -43,9 +43,12 @@ else
selectedRelationType = filter.childs[0].value; selectedRelationType = filter.childs[0].value;
} }
} }
var originalObjectId = vars.get("$param.ObjectId_param"); if (vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
{
var originalObjectId = vars.get("$param.ObjectId_param");
_loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType); _loadObjectRelationTree(originalObjectId, vars.get("$param.ObjectType_param"), selectedRelationType);
}
} }
result.object(tree); result.object(tree);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment