Commit 01524ef0 authored by Xavier Watkins's avatar Xavier Watkins
Browse files

Merge branch 'master' of https://github.com/ebi-uniprot/QuickGoFE into beta

* 'master' of https://github.com/ebi-uniprot/QuickGoFE:
  Code was not merged properly
parents 1cdfb964 d0ee53ac
......@@ -15,26 +15,8 @@ app.controller('AdvancedFiltersCtrl', function($scope, $rootScope, $routeParams,
$scope.namesMap = {};
angular.forEach($routeParams, function(val, type) {
if(type === 'id') {
var isGoTerm = val.indexOf("GO");
if(isGoTerm >= 0) {
filteringService.addFilter('goID', val, true);
} else {
filteringService.addFilter('ecoID', val, true);
}
} else if(val.split(",").length > 0){
angular.forEach(val.split(','), function(value){
filteringService.addFilter(type,value,true)
});
} else {
filteringService.addFilter(type, val, true);
}
$rootScope.$on('filtersUpdate', function() {
$scope.filters = angular.copy(filteringService.getFilters());
});
// Get predefined slim sets
......@@ -238,4 +220,3 @@ app.controller('AdvancedFiltersCtrl', function($scope, $rootScope, $routeParams,
$scope.namesMap = filteringService.getNamesMap();
});
});
......@@ -253,19 +253,7 @@ filteringModule.factory('filteringService', function(hardCodedDataService,
};
filteringService.hasSlims = function() {
console.log("_filters: ", _filters);
return _filters.goTermUse === "slim";
//
// console.log("inside filteringService hasslims");
// return _.find(_filters, function(rw){
// console.log("rw: ",rw);
// return rw.value == "slim" })
//}
return _.find(_filters, function(rw){ return rw.value === 'slim'; });
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment