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 102 additions and 35 deletions
entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
+ 2
− 1
View file @ 264af18d
......@@ -7,7 +7,8 @@ import("Sql_lib");
var cond = newWhere()
.andIfSet("DOCUMENTTEMPLATE.KIND", "$param.DocumentTemplateType_param")
.andIfSet("DOCUMENTTEMPLATE.CLASSIFICATION", "$param.DocumentTemplateTypeClassification_param");
.andIfSet("DOCUMENTTEMPLATE.CLASSIFICATION", "$param.DocumentTemplateTypeClassification_param")
.andIfSet("DOCUMENTTEMPLATE.ISOLANGUAGE", "$param.Language_param");
if(vars.get("$param.ComingFrom_param"))
{
......
entity/Document_entity/entityfields/msteam/children/synchronizedocuments/onActionProcess.js
+ 8
− 6
View file @ 264af18d
import("system.neonFilter");
import("system.neon");
import("system.vars");
neon.openContext("MSTeamsDocument", "MSTeamsDocumentEdit_view", null, neon.OPERATINGSTATE_VIEW, {
"MSTTeamId_param" : vars.get("$param.MSTTeamId_param"),
"ObjectRowId_param" : vars.get("$param.AssignmentRowId_param"),
"AssignmentName_param" : vars.get("$param.AssignmentName_param"),
"AssignmentTable_param" : vars.get("$param.AssignmentTable_param")
});
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
"MSTTeamId_param": vars.get("$param.MSTTeamId_param"),
"ObjectRowId_param": vars.get("$param.AssignmentRowId_param"),
"AssignmentName_param": vars.get("$param.AssignmentName_param"),
"AssignmentTable_param": vars.get("$param.AssignmentTable_param")
}).toString();
neon.openContextWithRecipe("MSTeamsDocument", "MSTeamsDocumentEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
entity/DuplicateScanner_entity/entityfields/filteractions/children/viewduplicates/onActionProcess.js
+ 4
− 2
View file @ 264af18d
import("system.neonFilter");
import("Sql_lib");
import("system.translate");
import("system.question");
......@@ -18,9 +19,10 @@ if(vars.get("$sys.selection").length == 1)
.where("UNRELATEDDUPLICATES.DUPLICATETYPE = HASDUPLICATE.OBJECT_TYPE"), SqlBuilder.NOT_IN())
.arrayColumn();
neon.openContext(contextId, null, duplicateIds, neon.OPERATINGSTATE_SEARCH, null);
var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist(duplicateIds);
neon.openContextWithRecipe(contextId, null, recipe.toString(), neon.OPERATINGSTATE_SEARCH);
}
else
{
question.showMessage(translate.text("Please select only one element"));
}
\ No newline at end of file
}
entity/Duplicate_entity/entityfields/filteractions/children/mergecurrentintoselected/onActionProcess.js
+ 3
− 1
View file @ 264af18d
import("system.neonFilter");
import("system.translate");
import("system.question");
import("Employee_lib");
......@@ -19,7 +20,8 @@ if(vars.get("$sys.selection").length == 1)
let currentContactId = EmployeeUtils.getCurrentContactId() || "";
DuplicateMergeUtils.createMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, context);
neon.openContext(context, null, [targetContactId], neon.OPERATINGSTATE_VIEW, null);
var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist([targetContactId]);
neon.openContextWithRecipe(context, null, recipe.toString(), neon.OPERATINGSTATE_VIEW);
}
}
else
......
entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/setworkflow/onActionProcess.js
+ 6
− 4
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("system.neon");
var selection = JSON.stringify(vars.get("$sys.selection"));
var filter = JSON.stringify(vars.get("$sys.filter"));
neon.openContext("EmailFilterHandlingSetWorkflow", "EmailFilterHandlingSetWorkflowEdit_view", null, neon.OPERATINGSTATE_VIEW, {
"Selection_param": selection,
"Filter_param": filter
});
\ No newline at end of file
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
"Selection_param": selection,
"Filter_param": filter
}).toString();
neon.openContextWithRecipe("EmailFilterHandlingSetWorkflow", "EmailFilterHandlingSetWorkflowEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
entity/Email_entity/Email_entity.aod
+ 8
− 0
View file @ 264af18d
......@@ -39,6 +39,10 @@
<name>DocumentTemplateTypeClassification_param</name>
<valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>Language_param</name>
<valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplates/children/language_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
......@@ -141,6 +145,10 @@
<expose v="true" />
<description></description>
</entityParameter>
<entityParameter>
<name>Language_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<datalessRecordContainer>
......
entity/Person_entity/entityfields/title/displayValueProcess.js → entity/Email_entity/entityfields/documenttemplates/children/language_param/valueProcess.js
+ 4
− 0
View file @ 264af18d
import("system.result");
import("system.vars");
import("system.result");
if (vars.get("$field.TITLE"))
result.string(vars.get("$field.TITLE"));
result.string(vars.get("$param.Language_param"));
\ No newline at end of file
entity/Employee_entity/entityfields/setpassword/onActionProcess.js
+ 3
− 1
View file @ 264af18d
import("system.neonFilter");
import("system.vars");
import("system.neon");
var params = {
"PasswordChange_param" : true
};
neon.openContext("Employee", "EmployeePassword_view", [vars.get("$field.UID")], neon.OPERATINGSTATE_EDIT, params);
\ No newline at end of file
var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist([vars.get("$field.UID")]).parameters(params);
neon.openContextWithRecipe("Employee", "EmployeePassword_view", recipe.toString(), neon.OPERATINGSTATE_EDIT);
entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/stateProcess.js
+ 8
− 1
View file @ 264af18d
......@@ -7,7 +7,14 @@ let state;
if (!Utils.isNullOrEmpty(vars.get("$field.EXPORTTEMPLATEPLACEOFUSE_ID")) || Utils.toBoolean(vars.get("$param.IsMainPlaceOfUse_param")))
{
state = neon.COMPONENTSTATE_EDITABLE;
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
state = neon.COMPONENTSTATE_EDITABLE;
}
else
{
state = neon.COMPONENTSTATE_READONLY;
}
}
else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
......
entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
+ 1
− 1
View file @ 264af18d
......@@ -88,7 +88,7 @@
<entityField>
<name>exportCount</name>
<documentation>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/documentation.adoc</documentation>
<titleProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js</titleProcess>
<title>Datasets are exported</title>
<valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exportcount/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
......
entity/ExportTemplateSelection_entity/entityfields/charset/dropDownProcess.js
+ 4
− 1
View file @ 264af18d
import("system.result");
result.object([["UTF-8", "UTF-8"]]);
\ No newline at end of file
result.object([
["UTF-8", "UTF-8"],
["ISO-8859-1", "ISO-8859-1"]
]);
\ No newline at end of file
entity/ExportTemplateSelection_entity/entityfields/exportcount/titleProcess.js deleted 100644 → 0
+ 0
− 13
View file @ ff6ade0a
import("system.translate");
import("system.result");
import("system.vars");
var comingFrom = vars.get("$field.comingfrom")
var res
if(comingFrom == "Organisation")
res = translate.text("Organisations will be exported");
else if(comingFrom == "Person")
res = translate.text("Contacts will be exported");
result.string(res)
\ No newline at end of file
entity/ExportTemplate_entity/ExportTemplate_entity.aod
+ 15
− 0
View file @ 264af18d
......@@ -35,20 +35,25 @@
<mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/fieldseparator/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
<valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/fieldseparator/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
<contentType>DATE</contentType>
<valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<contentType>DATE</contentType>
<valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
<valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DESCRIPTION</name>
......@@ -99,6 +104,7 @@
<mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/sentenceseparator/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
<valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/sentenceseparator/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>FIELDDELIMITER</name>
......@@ -106,6 +112,7 @@
<mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/fielddelimiter/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
<valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/fielddelimiter/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>exportTemplateObjectType</name>
......@@ -176,6 +183,10 @@
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -232,6 +243,10 @@
<name>FIELDDELIMITER.value</name>
<recordfield>EXPORTTEMPLATE.FIELDDELIMITER</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
......
entity/ExportTemplate_entity/entityfields/date_edit/valueProcess.js 0 → 100644
+ 8
− 0
View file @ 264af18d
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
result.string(vars.get("$sys.date"));
}
\ No newline at end of file
entity/ExportTemplate_entity/entityfields/date_new/valueProcess.js 0 → 100644
+ 8
− 0
View file @ 264af18d
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
result.string(vars.get("$sys.date"));
}
\ No newline at end of file
entity/ExportTemplate_entity/entityfields/fielddelimiter/dropDownProcess.js
+ 1
− 1
View file @ 264af18d
import("system.translate");
import("system.result");
result.object([["quotation mark", translate.text("quotation mark")]])
\ No newline at end of file
result.object([["quotation mark", translate.text("quotation mark")]]);
\ No newline at end of file
entity/ExportTemplate_entity/entityfields/fielddelimiter/valueProcess.js 0 → 100644
+ 8
− 0
View file @ 264af18d
import("system.neon");
import("system.result");
import("system.vars");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
{
result.string("quotation mark");
}
\ No newline at end of file
entity/ExportTemplate_entity/entityfields/fieldseparator/dropDownProcess.js
+ 1
− 1
View file @ 264af18d
import("system.translate");
import("system.result");
result.object([["tabulator", translate.text("tabulator")], ["semicolon", translate.text("semicolon")], ["comma", translate.text("comma")]])
\ No newline at end of file
result.object([["tabulator", translate.text("tabulator")], ["semicolon", translate.text("semicolon")], ["comma", translate.text("comma")]]);
\ No newline at end of file
entity/ExportTemplate_entity/entityfields/fieldseparator/valueProcess.js 0 → 100644
+ 8
− 0
View file @ 264af18d
import("system.neon");
import("system.result");
import("system.vars");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
{
result.string("semicolon");
}
\ No newline at end of file
entity/ExportTemplate_entity/entityfields/openadminview/onActionProcess.js
+ 2
− 2
View file @ 264af18d
......@@ -4,6 +4,6 @@ import("Context_lib");
AdminViewUtils.open("EXPORTTEMPLATEID", [
["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
["USER_NEW", vars.get("$field.USER_NEW"), "DATE"],
["USER_EDIT", vars.get("$field.USER_EDIT"), "DATE"]
["USER_NEW", vars.get("$field.USER_NEW")],
["USER_EDIT", vars.get("$field.USER_EDIT")]
]);
\ 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