Skip to content
Snippets Groups Projects
Commit f4f22731 authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon:
Browse files

Merge branch '#1074915-ZentraleBeobachtungsaction' into '2021.0' 

#1074915-ZentraleBeobachtungsaction Veränderung der Gruppierung der Actions

See merge request xrm/basic!700
parents 5b93b0ca 0b1e0075
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 55 additions and 41 deletions
entity/Organisation_entity/Organisation_entity.aod
+ 21
− 16
View file @ f4f22731
......@@ -18,6 +18,27 @@
<titlePlural>Companies</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityActionGroup>
<name>observeActionGroup</name>
<children>
<entityActionField>
<name>observe</name>
<title>Observe</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
<isObjectAction v="true" />
<iconId>VAADIN:EYE</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
</entityActionField>
<entityActionField>
<name>cancelObservation</name>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
<iconId>VAADIN:EYE_SLASH</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
</entityActionField>
</children>
</entityActionGroup>
<entityField>
<name>CUSTOMERCODE</name>
<title>Customercode</title>
......@@ -1408,22 +1429,6 @@
<title>Serial Actions</title>
<iconId>NEON:GROUP_APPOINTMENT</iconId>
<children>
<entityActionField>
<name>cancelObservation</name>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
<iconId>VAADIN:EYE_SLASH</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
</entityActionField>
<entityActionField>
<name>observe</name>
<title>Observe</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/onActionProcess.js</onActionProcess>
<isObjectAction v="true" />
<iconId>VAADIN:EYE</iconId>
<stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/titleProcess.js</titleProcess>
</entityActionField>
<entityActionField>
<name>addToCampaignFromTable</name>
<title>Add to Campaign</title>
......
entity/Person_entity/Person_entity.aod
+ 21
− 16
View file @ f4f22731
......@@ -21,6 +21,27 @@
<titlePlural>Contacts</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
<entityActionGroup>
<name>observeActionGroup</name>
<children>
<entityActionField>
<name>observe</name>
<title>Observe</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
<isObjectAction v="true" />
<iconId>VAADIN:EYE</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
</entityActionField>
<entityActionField>
<name>cancelObservation</name>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
<iconId>VAADIN:EYE_SLASH</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
</entityActionField>
</children>
</entityActionGroup>
<entityField>
<name>DATEOFBIRTH</name>
<title>Date of birth</title>
......@@ -1358,22 +1379,6 @@
<isObjectAction v="false" />
<iconId>VAADIN:ENVELOPES</iconId>
</entityActionField>
<entityActionField>
<name>observe</name>
<title>Observe</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/observe/onActionProcess.js</onActionProcess>
<isObjectAction v="true" />
<iconId>VAADIN:EYE</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/observe/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/observe/titleProcess.js</titleProcess>
</entityActionField>
<entityActionField>
<name>cancelObservation</name>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
<iconId>VAADIN:EYE_SLASH</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
</entityActionField>
<entityActionField>
<name>addToContactSync</name>
<title>add Contact to Sync</title>
......
entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/stateProcess.js → entity/Person_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js
+ 1
− 1
View file @ f4f22731
......@@ -3,4 +3,4 @@ import("system.result");
import("Observation_lib");
import("system.neon");
result.string(Observation.actionState(vars.get("$sys.selection"), true));
result.string(Observation.actionState(vars.get("$sys.selection"), true));
\ No newline at end of file
neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+ 6
− 4
View file @ f4f22731
......@@ -51,8 +51,9 @@
<name>Organisations</name>
<subtitleField>CUSTOMERCODE_DISPLAY_fieldGroup</subtitleField>
<entityField>#ENTITY</entityField>
<favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
<favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>filterViewActionGroup</favoriteActionGroup2>
<favoriteActionGroup3>DuplicateActions</favoriteActionGroup3>
<linkedColumns>
<element>NAME</element>
</linkedColumns>
......@@ -99,8 +100,9 @@
<treeTableViewTemplate>
<name>Treetable</name>
<entityField>#ENTITY</entityField>
<favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
<favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>filterViewActionGroup</favoriteActionGroup2>
<favoriteActionGroup3>DuplicateActions</favoriteActionGroup3>
<linkedColumns>
<element>NAME</element>
</linkedColumns>
......
neonView/PersonFilter_view/PersonFilter_view.aod
+ 6
− 4
View file @ f4f22731
......@@ -55,8 +55,9 @@
<subtitleField>LANGUAGE</subtitleField>
<descriptionField>ORGANISATION_CONTACTID</descriptionField>
<entityField>#ENTITY</entityField>
<favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
<favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>filterViewActionGroup</favoriteActionGroup2>
<favoriteActionGroup3>DuplicateActions</favoriteActionGroup3>
<linkedColumns>
<element>FIRSTNAME</element>
<element>LASTNAME</element>
......@@ -104,8 +105,9 @@
<treeTableViewTemplate>
<name>Treetable</name>
<entityField>#ENTITY</entityField>
<favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
<favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>filterViewActionGroup</favoriteActionGroup2>
<favoriteActionGroup3>DuplicateActions</favoriteActionGroup3>
<linkedColumns>
<element>FIRSTNAME</element>
<element>LASTNAME</element>
......
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