Merge branch '#1057201_Beziehungen_Bearbeiten' into '2020.1.0'

#1057201_Beziehungen_Bearbeiten Nummern vertauscht

See merge request xrm/basic!237

entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js

@@ -83,7 +83,7 @@ else
             _loadObjectRelationTree.call(tree, originalObjectIds[i], originalObjectTypes[i], selectedRelationType);
         }
     }
-    if (uidParam) //workaround!
+    if (uidParam) //workaround! 
         tree = tree.filter(function (row) {return JSON.parse(row[0])[UID.objectRelationId] == uidParam});
 }
 
@@ -233,7 +233,7 @@ function _getEntryData(pObjectId, pDirection, pRelationType1, pRelationType2, pP
     if (pRelationType1 == undefined || pRelationType2 == undefined) 
         return [];
     
-    var [myNum, otherNum] = pDirection == "normal" ? [1, 2] : [2, 1];
+    var [myNum, otherNum] = pDirection == "normal" ? [2, 1] : [1, 2];
     
     onConditionForRelationTypeJoin = newWhere("AB_OBJECTRELATIONTYPEID = AB_OBJECTRELATIONTYPE" + myNum)
         .and("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", pRelationType1)