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

Merge branch '1073891-beobachtungshotfix' into '2021.0.0' 

1073891 beobachtungshotfix

See merge request xrm/basic!648
parents 1aca2af6 14999889
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 47 additions and 90 deletions
.aditoprj/blueprints/CreateObservationActionBlueprint.xml
+ 6
− 18
View file @ 3a38272c
...@@ -18,18 +18,12 @@ ...@@ -18,18 +18,12 @@
Observation.insertAction();</onActionProcess> Observation.insertAction();</onActionProcess>
<isObjectAction v="true" /> <isObjectAction v="true" />
<iconId>VAADIN:EYE</iconId> <iconId>VAADIN:EYE</iconId>
<stateProcess>import("system.result"); <stateProcess>import("system.vars");
import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (!Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection")));</stateProcess>
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
else
{
result.string(neon.COMPONENTSTATE_INVISIBLE);
}</stateProcess>
<titleProcess>import("system.result"); <titleProcess>import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.vars"); import("system.vars");
...@@ -43,18 +37,12 @@ result.string(Observation.observeActionTitle(vars.get("$sys.selection"))); ...@@ -43,18 +37,12 @@ result.string(Observation.observeActionTitle(vars.get("$sys.selection")));
Observation.cancelAction();</onActionProcess> Observation.cancelAction();</onActionProcess>
<iconId>VAADIN:EYE_SLASH</iconId> <iconId>VAADIN:EYE_SLASH</iconId>
<stateProcess>import("system.result"); <stateProcess>import("system.vars");
import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection"), true));</stateProcess>
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
else
{
result.string(neon.COMPONENTSTATE_INVISIBLE);
}</stateProcess>
<titleProcess>import("system.result"); <titleProcess>import("system.result");
import("system.vars"); import("system.vars");
import("Observation_lib"); import("Observation_lib");
......
entity/Activity_entity/entityfields/filteractions/children/cancelobservation/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection"), true));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Activity_entity/entityfields/filteractions/children/observe/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (!Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection")));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Campaign_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection"), true));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Campaign_entity/entityfields/observeactiongroup/children/observe/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (!Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection")));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Contract_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection"), true));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Contract_entity/entityfields/observeactiongroup/children/observe/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (!Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection")));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Employee_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection"), true));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Employee_entity/entityfields/observeactiongroup/children/observe/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (!Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection")));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Leadimport_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection"), true));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Leadimport_entity/entityfields/observeactiongroup/children/observe/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (!Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection")));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Observation_entity/documentation.adoc
+ 5
− 0
View file @ 3a38272c
...@@ -14,3 +14,8 @@ inserted, updated or deleted. ...@@ -14,3 +14,8 @@ inserted, updated or deleted.
* The entity had to have a content Title * The entity had to have a content Title
* The entity had to be customizing in the Blacklist_param of the Context Consumer if its not an dependency. Otherwise it had to be customizing in the Dependency_lib with the "isObservable" option * The entity had to be customizing in the Blacklist_param of the Context Consumer if its not an dependency. Otherwise it had to be customizing in the Dependency_lib with the "isObservable" option
* The entityfields which should not be displayed must also be customized * The entityfields which should not be displayed must also be customized
=== Enable Observation
* Enable the custom field observation.isEnabled in the _____PREFERENCES_PROJECT
* Create the Observation Context and add the Entity, the Views (ObservationEdit_view, ObservationFilter_view, ObservationPreview_view), the Icon (VAADIN:EYE) and the Tile "Observation" to it
entity/Offer_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection"), true));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Offer_entity/entityfields/observeactiongroup/children/observe/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (!Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection")));
result.string(neon.COMPONENTSTATE_EDITABLE); \ No newline at end of file
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Order_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection"), true));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Order_entity/entityfields/observeactiongroup/children/observe/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (!Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection")));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Organisation_entity/entityfields/filterviewactiongroup/children/cancelobservation/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection"), true));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Organisation_entity/entityfields/filterviewactiongroup/children/observe/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (!Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection")));
result.string(neon.COMPONENTSTATE_EDITABLE); \ No newline at end of file
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Person_entity/entityfields/filterviewactiongroup/children/cancelobservation/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection"), true));
result.string(neon.COMPONENTSTATE_EDITABLE); \ No newline at end of file
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
entity/Person_entity/entityfields/filterviewactiongroup/children/observe/stateProcess.js
+ 2
− 4
View file @ 3a38272c
import("system.vars");
import("system.result"); import("system.result");
import("Observation_lib"); import("Observation_lib");
import("system.neon"); import("system.neon");
if (!Observation.countObservations()) result.string(Observation.actionState(vars.get("$sys.selection")));
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ 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