dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21764
committer: Markus Bekken <markus.bekken@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2016-01-15 17:25:20 +0100
message:
  Fixed file name blanking in some scenarios
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2016-01-09 11:32:08 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2016-01-15 16:25:20 +0000
@@ -511,6 +511,7 @@
         $scope.editingEventInGrid = false;
         $scope.currentElement.updated = false;        
         $scope.currentEvent = {};
+        $scope.fileNames['SINGLE_EVENT'] = [];
         $scope.currentElement = {};
         $scope.currentEventOriginialValue = angular.copy($scope.currentEvent);
     };
@@ -518,6 +519,7 @@
     $scope.showEventRegistration = function(){        
         $scope.displayCustomForm = $scope.customForm ? true : false;
         $scope.currentEvent = {};
+        $scope.fileNames['SINGLE_EVENT'] = [];
         $scope.eventRegistration = !$scope.eventRegistration;          
         $scope.currentEvent = angular.copy($scope.newDhis2Event);        
         $scope.outerForm.submitted = false;
@@ -690,6 +692,7 @@
                 $scope.currentEvent = {};
                 $scope.currentEvent = angular.copy($scope.newDhis2Event); 
                 $scope.currentEventOriginialValue = angular.copy($scope.currentEvent);
+                $scope.fileNames['SINGLE_EVENT'] = [];
                                
                 $scope.note = {};
                 $scope.outerForm.submitted = false;
@@ -900,7 +903,8 @@
                     }
                 }
                 $scope.dhis2Events.splice(index,1);                
-                $scope.currentEvent = {};             
+                $scope.currentEvent = {}; 
+                $scope.fileNames['SINGLE_EVENT'] = [];
             });
         });        
     };