=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2015-06-24 06:56:16 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2015-08-25 20:05:49 +0000 @@ -312,7 +312,7 @@ $scope.showSearchDiv = false; $timeout(function() { $rootScope.$broadcast('registrationWidget', {registrationMode: 'REGISTRATION'}); - }, 100); + }, 1000); } else{ $scope.doSearch = true; === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2015-08-24 09:55:12 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js 2015-08-25 20:05:49 +0000 @@ -255,6 +255,10 @@ if( program.userRoles.hasOwnProperty( userRoles[i].id ) ){ hasRole = true; } + + if(!hasRole && userRoles[i].authorities && userRoles[i].authorities.indexOf('ALL') !== -1){ + hasRole = true; + } } return hasRole; };