Skip to content
Snippets Groups Projects
Commit 264af18d authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

merged origin/2021.2.1 into 2021.2

parents ff6ade0a 6a106469
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 104 additions and 29 deletions
entity/Member_entity/entityfields/msteamsactiongroup/children/createteam/onActionProcess.js
+ 3
− 1
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("system.neon");
import("system.teams");
......@@ -22,4 +23,5 @@ if (objectType === "Salesproject")
params["Description_param"] = description;
}
neon.openContext("MSTTeam", null, null, neon.OPERATINGSTATE_NEW, params);
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
neon.openContextWithRecipe("MSTTeam", null, recipe, neon.OPERATINGSTATE_NEW);
entity/Member_entity/entityfields/msteamsactiongroup/children/editteam/onActionProcess.js
+ 8
− 5
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("system.neon");
neon.openContext("MSTTeam", null, [vars.get("$param.MSTTeamId_param")], neon.OPERATINGSTATE_EDIT, {
"ObjectRowId_param": vars.get("$param.ObjectRowId_param"),
"ObjectType_param": vars.get("$param.ObjectType_param"),
"ContactIds_param": vars.get("$param.ContactIds_param")
});
var recipe = neonFilter.createEntityRecordsRecipeBuilder()
.uidsIncludelist([vars.get("$param.MSTTeamId_param")]).parameters({
"ObjectRowId_param": vars.get("$param.ObjectRowId_param"),
"ObjectType_param": vars.get("$param.ObjectType_param"),
"ContactIds_param": vars.get("$param.ContactIds_param")
}).toString();
neon.openContextWithRecipe("MSTTeam", null, recipe, neon.OPERATINGSTATE_EDIT);
entity/MosaicoTemplate_entity/entityfields/copytemplate/onActionProcess.js
+ 4
− 2
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("system.neon");
var params = {
"CopyMosaicoTemplateIdParam" : vars.get("$field.MOSAICOTEMPLATEID")
"CopyMosaicoTemplateIdParam": vars.get("$field.MOSAICOTEMPLATEID")
};
neon.openContext("MosaicoTemplate", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
neon.openContextWithRecipe("MosaicoTemplate", null, recipe, neon.OPERATINGSTATE_NEW);
entity/MosaicoTemplate_entity/entityfields/newdocumenttemplate/onActionProcess.js
+ 4
− 2
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("system.neon");
var params = {
"CreateFromMosaicoTemplateId_param" : vars.get("$field.MOSAICOTEMPLATEID")
"CreateFromMosaicoTemplateId_param": vars.get("$field.MOSAICOTEMPLATEID")
};
neon.openContext("DocumentTemplate", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
neon.openContextWithRecipe("DocumentTemplate", null, recipe, neon.OPERATINGSTATE_NEW);
entity/ObjectTree_entity/ObjectTree_entity.aod
+ 2
− 0
View file @ 264af18d
......@@ -136,9 +136,11 @@
<children>
<entityActionField>
<name>insert</name>
<title>Create subordinate relationship</title>
<onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js</onActionProcess>
<iconId>VAADIN:FILE_TREE_SMALL</iconId>
<stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js</stateProcess>
<tooltip>Create subordinate relationship</tooltip>
</entityActionField>
</children>
</entityActionGroup>
......
entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
+ 4
− 2
View file @ 264af18d
import("system.neonFilter");
import("system.result");
import("system.neon");
import("system.vars");
......@@ -28,6 +29,7 @@ if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
"RelationTypes_param" : vars.get("$field.OBJECTRELATIONTYPEID")
};
neon.openContext("ObjectTree", "ObjectTreeEdit_view", null, neon.OPERATINGSTATE_NEW, params);
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
neon.openContextWithRecipe("ObjectTree", "ObjectTreeEdit_view", recipe, neon.OPERATINGSTATE_NEW);
}
}
\ No newline at end of file
}
entity/ObservationMultiple_entity/ObservationMultiple_entity.aod
+ 1
− 0
View file @ 264af18d
......@@ -87,6 +87,7 @@
<entityActionField>
<name>addObservations</name>
<onActionProcess>%aditoprj%/entity/ObservationMultiple_entity/entityfields/addobservations/onActionProcess.js</onActionProcess>
<iconId>NEON:OBSERVE</iconId>
<titleProcess>%aditoprj%/entity/ObservationMultiple_entity/entityfields/addobservations/titleProcess.js</titleProcess>
</entityActionField>
<entityParameter>
......
entity/Observation_entity/entityfields/filteractions/children/adddependency/onActionProcess.js
+ 9
− 6
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("system.entities");
import("Observation_lib");
......@@ -5,9 +6,11 @@ import("system.neon");
let selectedUIDs = vars.get("$sys.selection");
if (selectedUIDs.length === 1){
let params = {
"Observation_id_param" : selectedUIDs[0]
}
neon.openContext("Observation", "ObservationEdit_view", null, neon.OPERATINGSTATE_NEW, params);
}
\ No newline at end of file
if (selectedUIDs.length === 1)
{
var params = {
"Observation_id_param": selectedUIDs[0]
};
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
neon.openContextWithRecipe("Observation", "ObservationEdit_view", recipe, neon.OPERATINGSTATE_NEW);
}
entity/Offer_entity/entityfields/approveoffer/onActionProcess.js
+ 3
− 1
View file @ 264af18d
import("system.neonFilter");
import("Employee_lib");
import("Workflow_lib");
import("system.neon");
......@@ -10,4 +11,5 @@ var taskId = WorkflowUtils.getTaskId(offerId, ContextUtils.getCurrentContextId()
newWhere("OFFER.OFFERID", offerId).updateFields({"ACTIONUSER" : EmployeeUtils.getCurrentContactId()});
neon.openContext("WorkflowTask", "WorkflowTaskForm_view", [taskId], neon.OPERATINGSTATE_EDIT, null);
\ No newline at end of file
var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist([taskId]).toString();
neon.openContextWithRecipe("WorkflowTask", "WorkflowTaskForm_view", recipe, neon.OPERATINGSTATE_EDIT);
entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
+ 4
− 2
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("system.neon");
import("Offer_lib");
......@@ -17,5 +18,6 @@ var params = {
"OfferDeliveryTerm_param" : vars.get("$field.DELIVERYTERMS"),
"OfferPaymentTerm_param" : vars.get("$field.PAYMENTTERMS"),
"Discount_param": vars.get("$field.DISCOUNT")
}
neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
};
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
neon.openContextWithRecipe("Offer", null, recipe, neon.OPERATINGSTATE_NEW);
entity/Offeritem_entity/Offeritem_entity.aod
+ 8
− 0
View file @ 264af18d
......@@ -296,6 +296,10 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/currency/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -408,6 +412,10 @@
<name>DISCOUNT.displayValue</name>
<expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/discount.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js
+ 6
− 2
View file @ 264af18d
import("system.neon");
import("Product_lib");
import("system.vars");
import("system.result");
import("Sql_lib");
if(vars.get("$field.PRODUCT_ID"))
result.string(newSelect("PRODUCT.PRODUCTNAME").from("PRODUCT").whereIfSet("PRODUCT.PRODUCTID", vars.get("$field.PRODUCT_ID")).cell());
\ No newline at end of file
if(vars.get("$field.PRODUCT_ID") && vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
{
result.string(ProductUtils.getProductName(vars.get("$field.PRODUCT_ID")));
}
\ No newline at end of file
entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js 0 → 100644
+ 12
− 0
View file @ 264af18d
import("Product_lib");
import("Person_lib");
import("KeywordRegistry_basic");
import("Keyword_lib");
import("system.result");
import("Sql_lib");
var sqlMask = new SqlMaskingUtils();
var sql = sqlMask.concatenate(["'TEXT:'", "(" + ProductUtils.getProductNameSubSql("OFFERITEM.PRODUCT_ID") + ")"]);
result.string(sql.toString());
\ No newline at end of file
entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js
+ 2
− 1
View file @ 264af18d
import("Product_lib");
import("system.vars");
import("system.result");
// TODO: remove when #title is used as display value for lookups
result.string("(select PRODUCT.PRODUCTNAME from PRODUCT where OFFERITEM.PRODUCT_ID = PRODUCT.PRODUCTID)");
\ No newline at end of file
result.string(ProductUtils.getProductNameSubSql("OFFERITEM.PRODUCT_ID"));
\ No newline at end of file
entity/Order_entity/entityfields/setdunning/onActionProcess.js
+ 3
− 1
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("system.neon");
neon.openContext("Order", "OrderDunning_view", [vars.get("$field.SALESORDERID")], neon.OPERATINGSTATE_EDIT, null);
var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist([vars.get("$field.SALESORDERID")]);
neon.openContextWithRecipe("Order", "OrderDunning_view", recipe.toString(), neon.OPERATINGSTATE_EDIT);
entity/Order_entity/entityfields/setpaid/onActionProcess.js
+ 3
− 1
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("system.neon");
neon.openContext("Order", "OrderPaid_view", [vars.get("$field.SALESORDERID")], neon.OPERATINGSTATE_EDIT, null);
var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist([vars.get("$field.SALESORDERID")]);
neon.openContextWithRecipe("Order", "OrderPaid_view", recipe.toString(), neon.OPERATINGSTATE_EDIT);
entity/Orderitem_entity/Orderitem_entity.aod
+ 8
− 0
View file @ 264af18d
......@@ -278,6 +278,10 @@
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/currency/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -368,6 +372,10 @@
<isFilterable v="true" />
<isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/Orderitem_entity/entityfields/product_id/displayValueProcess.js
+ 6
− 2
View file @ 264af18d
import("Product_lib");
import("system.neon");
import("system.vars");
import("system.result");
import("Sql_lib");
if(vars.get("$field.PRODUCT_ID"))
result.string(newSelect("PRODUCT.PRODUCTNAME").from("PRODUCT").whereIfSet("PRODUCT.PRODUCTID", vars.get("$field.PRODUCT_ID")).cell());
\ No newline at end of file
if(vars.get("$field.PRODUCT_ID") && vars.get("$sys.viewmode") != neon.FRAME_VIEWMODE_TABLE)
{
result.string(ProductUtils.getProductName(vars.get("$field.PRODUCT_ID")));
}
\ No newline at end of file
entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js 0 → 100644
+ 12
− 0
View file @ 264af18d
import("Product_lib");
import("Person_lib");
import("KeywordRegistry_basic");
import("Keyword_lib");
import("system.result");
import("Sql_lib");
var sqlMask = new SqlMaskingUtils();
var sql = sqlMask.concatenate(["'TEXT:'", "(" + ProductUtils.getProductNameSubSql("SALESORDERITEM.PRODUCT_ID") + ")"]);
result.string(sql.toString());
\ No newline at end of file
entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js
+ 2
− 1
View file @ 264af18d
import("Product_lib");
import("system.vars");
import("system.result");
// TODO: remove when #title is used as display value for lookups
result.string("(select PRODUCT.PRODUCTNAME from PRODUCT where SALESORDERITEM.PRODUCT_ID = PRODUCT.PRODUCTID)");
\ No newline at end of file
result.string(ProductUtils.getProductNameSubSql("SALESORDERITEM.PRODUCT_ID"));
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment