=== 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-12-03 17:02:34 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js 2015-12-04 08:34:15 +0000 @@ -212,7 +212,7 @@ //$scope.searchParam = {bools: []}; $scope.search = function(mode){ - resetParams() + resetParams(); var grid = TEIGridService.generateGridColumns($scope.attributes, $scope.selectedOuMode.name); $scope.gridColumns = grid.columns; @@ -223,22 +223,26 @@ } //check search mode - if( $scope.selectedSearchMode === $scope.searchMode.freeText ){ - - if(!$scope.searchText){ - $scope.emptySearchText = true; - $scope.teiFetched = false; - return; - } - - $scope.queryUrl = 'query=LIKE:' + $scope.searchText; + if( $scope.selectedSearchMode === $scope.searchMode.freeText ){ + + if($scope.searchText){ + $scope.queryUrl = 'query=LIKE:' + $scope.searchText; + } + else{ + if(!$scope.selectedProgram || !$scope.selectedProgram.displayFrontPageList){ + $scope.emptySearchText = true; + $scope.teiFetched = false; + return; + } + } + $scope.attributes = EntityQueryFactory.resetAttributesQuery($scope.attributes, $scope.enrollment); $scope.searchingOrgUnit = $scope.selectedOrgUnit; } if( $scope.selectedSearchMode === $scope.searchMode.attributeBased ){ - $scope.searchText = ''; + $scope.searchText = null; $scope.attributeUrl = EntityQueryFactory.getAttributesQuery($scope.attributes, $scope.enrollment); @@ -252,7 +256,7 @@ } if( $scope.selectedSearchMode === $scope.searchMode.listAll ){ - $scope.searchText = ''; + $scope.searchText = null; $scope.attributes = EntityQueryFactory.resetAttributesQuery($scope.attributes, $scope.enrollment); $scope.searchingOrgUnit = $scope.selectedOrgUnit; }