Skip to content
Snippets Groups Projects
Commit 41c8a6df authored by Johannes Hörmann's avatar Johannes Hörmann Committed by David Büchler
Browse files

JSON.parse an einigen stellen entfernt, wenn die Variablen mit vars.get direkt ein Objekt liefern

parent ada1f5bb
No related branches found
No related tags found
No related merge requests found
Showing
with 27 additions and 29 deletions
......@@ -12,7 +12,7 @@ if (vars.exists("$param.Country_param") && vars.get("$param.Country_param"))
// get the value typed by the user
var filter = "";
var sysFilter = vars.get("$sys.filter");
var sysFilter = vars.getString("$sys.filter");
if(sysFilter.filter != null) {
filter = JSON.parse(sysFilter.filter).childs[0].value;
}
......
......@@ -3,9 +3,6 @@ import("system.neon");
import("system.logging");
import("system.vars");
if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
{
var entry = JSON.parse(vars.getString("$param.Entry_param"));
......
......@@ -12,7 +12,7 @@ var newState = "ACCEPTED";
if(calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS)
{
AppointmentUtils.sendExchangedAction(vars.get("$param.Entry_param"), newState);
AppointmentUtils.sendExchangedAction(vars.getString("$param.Entry_param"), newState);
}
else
{
......
......@@ -12,7 +12,7 @@ var newState = "DECLINED";
if(calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS)
{
AppointmentUtils.sendExchangedAction(vars.get("$param.Entry_param"), newState);
AppointmentUtils.sendExchangedAction(vars.getString("$param.Entry_param"), newState);
}
else
{
......
......@@ -12,7 +12,7 @@ var newState = "TENTATIVE";
if(calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS)
{
AppointmentUtils.sendExchangedAction(vars.get("$param.Entry_param"), newState);
AppointmentUtils.sendExchangedAction(vars.getString("$param.Entry_param"), newState);
}
else
{
......
......@@ -13,7 +13,7 @@ if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
var masterEntry = null;
if (vars.exists("$param.MasterEntry_param") && vars.get("$param.MasterEntry_param") != "") {
masterEntry = JSON.parse(vars.get("$param.MasterEntry_param"));
masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
}
var uid = entry[calendars.ID];
......
import("system.logging");
import("ObjectRelation_lib");
import("system.neon");
import("system.vars");
if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
if (vars.exists("$sys.selection") && vars.get("$sys.selection"))
{
var selectedRows = JSON.parse(vars.getString("$sys.selection"));
var selectedRows = vars.get("$sys.selection");
logging.log("rows: " + selectedRows)
logging.log("rows: " + selectedRows[0])
var params = {
"ObjectType_param" : vars.get("$param.ObjectType_param"),
"ObjectRowId_param" : vars.get("$param.ObjectRowId_param")
......
......@@ -4,9 +4,9 @@ import("system.neon");
import("Attribute_lib");
var state = neon.COMPONENTSTATE_DISABLED;
if (vars.exists("$sys.selectionRows"))
if (vars.exists("$sys.selectionRows") && vars.get("$sys.selectionRows").length > 0)
{
var row = JSON.parse(vars.getString("$sys.selectionRows"))[0];
var row = vars.get("$sys.selectionRows")[0];
if (row.AB_ATTRIBUTE_ID)
state = neon.COMPONENTSTATE_EDITABLE;
}
......
......@@ -34,7 +34,7 @@ else if (rowId)
if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
{
var filteredIds = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
var filteredIds = JSON.parse(vars.getString("$param.FilteredAttributeIds_param"));
var filteredIdsCondition = new SqlCondition();
filteredIds.forEach(function(id)
......
......@@ -5,8 +5,7 @@ import("Attribute_lib");
var params = {};
if (vars.exists("$local.rows"))
{
var row = JSON.parse(vars.get("$local.rows"));
var row = vars.get("$local.rows");
var type = row[0].ATTRIBUTE_TYPE.trim();
if (AttributeTypeUtil.isGroupType(type))
params["AttrParentId_param"] = row[0].UID;
......
......@@ -49,10 +49,10 @@ else if (objectType) //if there's an objectType, it comes from the AttributeRel
{
var filteredAttributes = [];
if (vars.exists("$param.FilteredAttributeIds_param") && vars.get("$param.FilteredAttributeIds_param"))
filteredAttributes = JSON.parse(vars.get("$param.FilteredAttributeIds_param"));
filteredAttributes = JSON.parse(vars.getString("$param.FilteredAttributeIds_param"));
var attributeCount;
if (vars.exists("$param.AttributeCount_param") && vars.get("$param.AttributeCount_param"))
attributeCount = JSON.parse(vars.get("$param.AttributeCount_param"));
attributeCount = JSON.parse(vars.getString("$param.AttributeCount_param"));
var ids = AttributeUtil.getPossibleAttributes(objectType, false, filteredAttributes, attributeCount);
condition.and("SELF.AB_ATTRIBUTEID in ('" + ids.join("','") + "')");
}
......
......@@ -2,7 +2,7 @@ import("system.result");
import("system.translate");
import("system.vars");
var campaignParticipantsAmount = JSON.parse(vars.get("$param.campaignParticipants_param")).length;
var campaignParticipantsAmount = JSON.parse(vars.getString("$param.campaignParticipants_param")).length;
var informationText = translate.text("participants will be added to the selected campaign step");
result.string(campaignParticipantsAmount + " " + informationText);
\ No newline at end of file
......@@ -8,7 +8,7 @@ logging.log("CampaignAnalysis_RecordContainer");
var ret = [];
var campaignstepid = "b80588dd-4287-4fd7-85c1-7b86118ac4ff";//TODO: Refresh problem - vars.get("$param.campaignStepId_param");
var newParticipants = JSON.parse(vars.get("$param.campaignParticipants_param")).length;
var newParticipants = JSON.parse(vars.getString("$param.campaignParticipants_param")).length;
var query = "select MAXPARTICIPANTS, count(CAMPAIGNPARTICIPANTID) from CAMPAIGNSTEP "
+ "join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID = CAMPAIGNSTEP.CAMPAIGNSTEPID "
......
......@@ -2,7 +2,7 @@ import("system.vars");
import("system.neon");
import("KeywordRegistry_basic");
var selection = JSON.parse(vars.getString("$sys.selectionRows"));
var selection = vars.get("$sys.selectionRows");
if (selection.length > 0)
{
var params = {
......
......@@ -9,8 +9,7 @@ cond.andPrepareVars("COMMUNICATION.CONTACT_ID", "$param.ContactId_param");
if (vars.exists("$param.CommMediumIds_param"))
{
var mediumIds = vars.get("$param.CommMediumIds_param");
mediumIds = JSON.parse(mediumIds);
var mediumIds = JSON.parse(vars.getString("$param.CommMediumIds_param"));
if(mediumIds.length > 0)
cond.and("COMMUNICATION.MEDIUM_ID in ('" + mediumIds.join("', '") + "')");
}
......
......@@ -16,9 +16,9 @@ var recordCond = SqlCondition.begin();
if (vars.exists("$local.idvalues"))
{
var semiId = vars.get("$local.idvalues");//this not really an ID, it's an object that contain the grouped content fields
if (semiId)
if (semiId && semiId.length > 0)
{
var groupingInfo = JSON.parse(semiId);
var groupingInfo = JSON.parse(semiId[0]);
recordCond.andPrepare("AB_LOGHISTORY.USER_NEW", groupingInfo.u);
var dateFilterValue = datetime.toLong(groupingInfo.d, "yyyy-MM-dd HH:mm");
recordCond.andPrepare("AB_LOGHISTORY.DATE_NEW", dateFilterValue, "# >= ?");
......@@ -91,7 +91,7 @@ function _groupData(pData)
function _getTableNameCondition()
{
var tableNameCond = SqlCondition.begin();
var tableNamesList = JSON.parse(vars.get("$param.tablenames_param"));
var tableNamesList = JSON.parse(vars.getString("$param.tablenames_param"));
//returns the condition for one entry in the tableNamesList
var _getCond = function(pDefinition)
......
......@@ -4,7 +4,7 @@ import("system.notification");
import("system.neon");
var user = tools.getCurrentUser();
var selectedNotifications = JSON.parse(vars.getString("$sys.selection"));
var selectedNotifications = vars.get("$sys.selection");
for(var i = 0; i < selectedNotifications.length; i++)
notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
......
......@@ -4,7 +4,7 @@ import("system.notification");
import("system.neon");
var user = tools.getCurrentUser();
var selectedNotifications = JSON.parse(vars.getString("$sys.selection"));
var selectedNotifications = vars.get("$sys.selection");
for(var i = 0; i < selectedNotifications.length; i++)
notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_ARCHIVE);
......
......@@ -4,7 +4,7 @@ import("system.notification");
import("system.neon");
var user = tools.getCurrentUser();
var selectedNotifications = JSON.parse(vars.getString("$sys.selection"));
var selectedNotifications = vars.get("$sys.selection");
for(var i = 0; i < selectedNotifications.length; i++)
notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
......
......@@ -4,7 +4,7 @@ import("system.notification");
import("system.neon");
var user = tools.getCurrentUser();
var selectedNotifications = JSON.parse(vars.getString("$sys.selection"));
var selectedNotifications = vars.get("$sys.selection");
for(var i = 0; i < selectedNotifications.length; i++)
notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_UNSEEN);
......
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