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

Merge branch 'neon_1083513_ObservationFalseLinking' into '2021.1'

[Projekt: Entwicklung - Neon][TicketNr.: 1083513][Beobachtungen: Verlinkung...

See merge request xrm/basic!1113
parents f4b84b2e 319cb3b7
No related branches found
No related tags found
No related merge requests found
...@@ -308,6 +308,10 @@ Observation.prototype._checkDependencies = function (pObserver, pDependentContex ...@@ -308,6 +308,10 @@ Observation.prototype._checkDependencies = function (pObserver, pDependentContex
{ {
specificRecordValues[Observation.OBJECT_IDs()] = results; specificRecordValues[Observation.OBJECT_IDs()] = results;
} }
else
{
pTempObserver[pObserver] = null;
}
}, this) }, this)
this.callerVariables[WorkflowVariables.ROWDATA()] = JSON.parse(tempOriginalRowdata); this.callerVariables[WorkflowVariables.ROWDATA()] = JSON.parse(tempOriginalRowdata);
} }
...@@ -453,8 +457,7 @@ Observation.prototype.checkObservation = function(pObservationId) ...@@ -453,8 +457,7 @@ Observation.prototype.checkObservation = function(pObservationId)
*/ */
Observation._syncTempObservationAndObservation = function (pTempObserver, pObservers, pObserverUserID, pChangedRows) Observation._syncTempObservationAndObservation = function (pTempObserver, pObservers, pObserverUserID, pChangedRows)
{ {
if (pTempObserver[pObserverUserID] && (!pTempObserver[pObserverUserID][Observation.OBJECT_IDs()] || if (pTempObserver[pObserverUserID])
Object.keys(pTempObserver[pObserverUserID][Observation.OBJECT_IDs()]).length > 0))
{ {
if (!pObservers[pObserverUserID]) if (!pObservers[pObserverUserID])
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment