fix: [DHIS2-15340] use orgunit of selected event before owning orgunit (

#1742)
dhis2 · May 25, 2023 · 82aee94 · 82aee94
1 parent 2967bf0
commit 82aee94
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/d2-tracker/dhis2.angular.services.js b/d2-tracker/dhis2.angular.services.js
@@ -3317,7 +3317,7 @@ var d2Services = angular.module('d2Services', ['ngResource'])
      * @param {*} flag execution flags
      */
     var internalFetchContextData = function(selectedEnrollment,executingEvent){
-        return OrgUnitFactory.getFromStoreOrServer( selectedEnrollment ? selectedEnrollment.orgUnit : executingEvent.orgUnit )
+        return OrgUnitFactory.getFromStoreOrServer(executingEvent && executingEvent.orgUnit ? executingEvent.orgUnit : selectedEnrollment.orgUnit)
             .then(function (orgUnit) {
                 var data = { selectedOrgUnit: orgUnit, selectedProgramStage: null};
                 if(executingEvent && executingEvent.program && executingEvent.programStage){