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

Merge branch '2020.1.2' into '2020.1' 

2020.1.2

See merge request xrm/basic!309
parents 6a6d6922 8d47b1d7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 123 additions and 163 deletions
entity/AnyContact_entity/AnyContact_entity.aod
+ 1
− 1
View file @ 1cbc9d61
......@@ -4,7 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
<contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
<onInit>%aditoprj%/entity/AnyContact_entity/onInit.js</onInit>
<initFilterProcess>%aditoprj%/entity/AnyContact_entity/initFilterProcess.js</initFilterProcess>
<imageProcess>%aditoprj%/entity/AnyContact_entity/imageProcess.js</imageProcess>
<recordContainer>db</recordContainer>
<entityFields>
......
entity/AnyContact_entity/initFilterProcess.js 0 → 100644
+ 19
− 0
View file @ 1cbc9d61
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
var statusInactive = $KeywordRegistry.contactStatus$inactive();
var filter = {
type: "group",
operator: "AND",
childs: [{
type: "row",
name: "STATUS",
operator: "NOT_EQUAL",
contenttype: "TEXT",
key: statusInactive,
value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
}]
};
result.string(JSON.stringify(filter));
\ No newline at end of file
entity/AnyContact_entity/onInit.js deleted 100644 → 0
+ 0
− 23
View file @ 6a6d6922
import("system.neon");
import("Keyword_lib");
import("system.vars");
import("KeywordRegistry_basic");
var statusFilterElement = {
"type":"row",
"name":"STATUS",
"operator":"NOT_EQUAL",
"key":$KeywordRegistry.contactStatus$inactive(),
"contenttype": "TEXT"
};
statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
var filter = {
"type":"group",
"operator":"AND",
"childs": [statusFilterElement]
};
filter = JSON.stringify(filter);
neon.setFilter("#ENTITY", filter);
\ No newline at end of file
entity/Contact_entity/Contact_entity.aod
+ 1
− 1
View file @ 1cbc9d61
......@@ -8,8 +8,8 @@
<grantUpdateProcess>%aditoprj%/entity/Contact_entity/grantUpdateProcess.js</grantUpdateProcess>
<grantDeleteProcess>%aditoprj%/entity/Contact_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Contact_entity/contentTitleProcess.js</contentTitleProcess>
<onInit>%aditoprj%/entity/Contact_entity/onInit.js</onInit>
<onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
<initFilterProcess>%aditoprj%/entity/Contact_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:USERS</iconId>
<titlePlural>Contacts</titlePlural>
<recordContainer>db</recordContainer>
......
entity/Contact_entity/initFilterProcess.js 0 → 100644
+ 19
− 0
View file @ 1cbc9d61
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
var statusInactive = $KeywordRegistry.contactStatus$inactive();
var filter = {
type: "group",
operator: "AND",
childs: [{
type: "row",
name: "STATUS",
operator: "NOT_EQUAL",
contenttype: "TEXT",
key: statusInactive,
value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
}]
};
result.string(JSON.stringify(filter));
\ No newline at end of file
entity/Contact_entity/onInit.js deleted 100644 → 0
+ 0
− 23
View file @ 6a6d6922
import("system.neon");
import("Keyword_lib");
import("system.vars");
import("KeywordRegistry_basic");
var statusFilterElement = {
"type":"row",
"name":"STATUS",
"operator":"NOT_EQUAL",
"key":$KeywordRegistry.contactStatus$inactive(),
"contenttype": vars.get("$property.STATUS.contentType")
};
statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
var filter = {
"type":"group",
"operator":"AND",
"childs": [statusFilterElement]
};
filter = JSON.stringify(filter);
neon.setFilter("#ENTITY", filter);
\ No newline at end of file
entity/Organisation_entity/Organisation_entity.aod
+ 2
− 1
View file @ 1cbc9d61
......@@ -7,8 +7,9 @@
<title>Company</title>
<grantDeleteProcess>%aditoprj%/entity/Organisation_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Organisation_entity/contentTitleProcess.js</contentTitleProcess>
<onInit>%aditoprj%/entity/Organisation_entity/onInit.js</onInit>
<afterUiInit>%aditoprj%/entity/Organisation_entity/afterUiInit.js</afterUiInit>
<afterOperatingState>%aditoprj%/entity/Organisation_entity/afterOperatingState.js</afterOperatingState>
<initFilterProcess>%aditoprj%/entity/Organisation_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:BUILDING</iconId>
<imageProcess>%aditoprj%/entity/Organisation_entity/imageProcess.js</imageProcess>
<titlePlural>Companies</titlePlural>
......
entity/Organisation_entity/afterUiInit.js 0 → 100644
+ 7
− 0
View file @ 1cbc9d61
import("system.neon");
import("system.vars");
import("Context_lib");
import("Attribute_lib");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
\ No newline at end of file
entity/Organisation_entity/initFilterProcess.js 0 → 100644
+ 19
− 0
View file @ 1cbc9d61
import("Keyword_lib");
import("KeywordRegistry_basic");
import("system.result");
var statusInactive = $KeywordRegistry.contactStatus$inactive();
var filter = {
type: "group",
operator: "AND",
childs: [{
type: "row",
name: "STATUS",
operator: "NOT_EQUAL",
contenttype: "TEXT",
key: statusInactive,
value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
}]
};
result.string(JSON.stringify(filter));
\ No newline at end of file
entity/Organisation_entity/onInit.js deleted 100644 → 0
+ 0
− 30
View file @ 6a6d6922
import("Keyword_lib");
import("KeywordRegistry_basic");
import("system.neon");
import("system.vars");
import("Context_lib");
import("Attribute_lib");
var statusFilterElement = {
"type":"row",
"name":"STATUS",
"operator":"NOT_EQUAL",
"key":$KeywordRegistry.contactStatus$inactive(),
"contenttype": "TEXT"
};
statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
var filter = {
"type":"group",
"operator":"AND",
"childs": [statusFilterElement]
};
filter = JSON.stringify(filter);
neon.setFilter("#ENTITY", filter);
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
}
entity/Person_entity/Person_entity.aod
+ 2
− 1
View file @ 1cbc9d61
......@@ -10,9 +10,10 @@
</siblings>
<grantDeleteProcess>%aditoprj%/entity/Person_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Person_entity/contentTitleProcess.js</contentTitleProcess>
<onInit>%aditoprj%/entity/Person_entity/onInit.js</onInit>
<afterUiInit>%aditoprj%/entity/Person_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Person_entity/onValidation.js</onValidation>
<afterOperatingState>%aditoprj%/entity/Person_entity/afterOperatingState.js</afterOperatingState>
<initFilterProcess>%aditoprj%/entity/Person_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:USERS</iconId>
<imageProcess>%aditoprj%/entity/Person_entity/imageProcess.js</imageProcess>
<usePermissions v="false" />
......
entity/Person_entity/afterUiInit.js 0 → 100644
+ 7
− 0
View file @ 1cbc9d61
import("system.neon");
import("system.vars");
import("Context_lib");
import("Attribute_lib");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
\ No newline at end of file
entity/Person_entity/initFilterProcess.js 0 → 100644
+ 19
− 0
View file @ 1cbc9d61
import("Keyword_lib");
import("KeywordRegistry_basic");
import("system.result");
var statusInactive = $KeywordRegistry.contactStatus$inactive();
var filter = {
type: "group",
operator: "AND",
childs: [{
type: "row",
name: "STATUS",
operator: "NOT_EQUAL",
contenttype: "TEXT",
key: statusInactive,
value: KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusInactive)
}]
};
result.string(JSON.stringify(filter));
\ No newline at end of file
entity/Person_entity/onInit.js deleted 100644 → 0
+ 0
− 30
View file @ 6a6d6922
import("Keyword_lib");
import("KeywordRegistry_basic");
import("system.neon");
import("system.vars");
import("Context_lib");
import("Attribute_lib");
var statusFilterElement = {
"type":"row",
"name":"STATUS",
"operator":"NOT_EQUAL",
"key":$KeywordRegistry.contactStatus$inactive(),
"contenttype": "TEXT"
};
statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), statusFilterElement.key);
var filter = {
"type":"group",
"operator":"AND",
"childs": [statusFilterElement]
};
filter = JSON.stringify(filter);
neon.setFilter("#ENTITY", filter);
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes");
}
entity/Task_entity/Task_entity.aod
+ 2
− 1
View file @ 1cbc9d61
......@@ -6,8 +6,9 @@
<title>Task</title>
<grantDeleteProcess>%aditoprj%/entity/Task_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Task_entity/contentTitleProcess.js</contentTitleProcess>
<onInit>%aditoprj%/entity/Task_entity/onInit.js</onInit>
<afterUiInit>%aditoprj%/entity/Task_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Task_entity/onValidation.js</onValidation>
<initFilterProcess>%aditoprj%/entity/Task_entity/initFilterProcess.js</initFilterProcess>
<iconId>VAADIN:TASKS</iconId>
<iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess>
<titlePlural>Tasks</titlePlural>
......
entity/Task_entity/afterUiInit.js 0 → 100644
+ 6
− 0
View file @ 1cbc9d61
import("system.neon");
import("system.vars");
import("ActivityTask_lib");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.PARENT_CONTEXT", "$field.PARENT_ID");
\ No newline at end of file
entity/Task_entity/initFilterProcess.js 0 → 100644
+ 19
− 0
View file @ 1cbc9d61
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
var statusEnded = $KeywordRegistry.taskStatus$ended();
var filter = {
type: "group",
operator: "AND",
childs: [{
type: "row",
name: "STATUS",
operator: "NOT_EQUAL",
contenttype: "TEXT",
key: statusEnded,
value: KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), statusEnded)
}]
};
result.string(JSON.stringify(filter));
\ No newline at end of file
entity/Task_entity/onInit.js deleted 100644 → 0
+ 0
− 31
View file @ 6a6d6922
import("system.neon");
import("system.vars");
import("system.neon");
import("ActivityTask_lib");
import("Keyword_lib");
import("KeywordRegistry_basic");
var recordState = vars.get("$sys.recordstate");
if(recordState == neon.OPERATINGSTATE_NEW)
{
TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.PARENT_CONTEXT", "$field.PARENT_ID");
}
else if (recordState != neon.OPERATINGSTATE_SEARCH)
{
var statusFilterElement = {
"type":"row",
"name":"STATUS",
"operator":"NOT_EQUAL",
"key":$KeywordRegistry.taskStatus$ended(),
"contenttype": "TEXT"
};
statusFilterElement.value = KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), statusFilterElement.key);
var filter = {
"type":"group",
"operator":"AND",
"childs": [statusFilterElement]
};
filter = JSON.stringify(filter);
neon.setFilter("#ENTITY", filter);
}
\ No newline at end of file
entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+ 0
− 1
View file @ 1cbc9d61
......@@ -7,7 +7,6 @@
<grantCreateProcess>%aditoprj%/entity/WorkflowDefinition_entity/grantCreateProcess.js</grantCreateProcess>
<grantDelete v="false" />
<contentTitleProcess>%aditoprj%/entity/WorkflowDefinition_entity/contentTitleProcess.js</contentTitleProcess>
<onInit>%aditoprj%/entity/WorkflowDefinition_entity/onInit.js</onInit>
<iconId>VAADIN:DROP</iconId>
<titlePlural>Workflow definitions</titlePlural>
<recordContainer>jdito</recordContainer>
......
entity/WorkflowDefinition_entity/onInit.js deleted 100644 → 0
+ 0
− 20
View file @ 6a6d6922
import("system.neon");
import("system.vars");
import("system.translate");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
{
var filterOnlyUnfinished = {
type : "group",
operator : "AND",
childs : [{
type : "row",
name : "ISFINISHED",
operator : "EQUAL",
value : translate.text("No"),
key : "false",
contenttype : "BOOLEAN"
}]
};
neon.setFilter("Instances", JSON.stringify(filterOnlyUnfinished));
}
\ 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