Commit a95fc29ad9df76476e0fdd8e1eec278b2b9e2b24

Authored by Leonardo Merlin
1 parent cb72c308

Improve filterProposals function

Showing 1 changed file with 18 additions and 20 deletions   Show diff stats
src/app/pages/ranking/ranking.controller.js
@@ -212,28 +212,26 @@ @@ -212,28 +212,26 @@
212 var per_page = _per_page || vm.per_page; 212 var per_page = _per_page || vm.per_page;
213 var query = vm.query; 213 var query = vm.query;
214 var selectedProgram = vm.selectedProgram; 214 var selectedProgram = vm.selectedProgram;
  215 + var params = {
  216 + page: page,
  217 + per_page: per_page
  218 + };
215 219
216 if (selectedProgram) { 220 if (selectedProgram) {
217 - var params = {  
218 - page: page,  
219 - per_page: per_page,  
220 - parent_id: selectedProgram.id  
221 - };  
222 -  
223 - if (query) {params.query = query; }  
224 -  
225 - vm.loadingProposals = true;  
226 - vm.DialogaService.searchProposals(params, function(data){  
227 - vm.total_proposals = parseInt(data._obj.headers('total'));  
228 - vm.filtredProposals = data.articles;  
229 - vm.loadingProposals = false;  
230 - }, function (error) {  
231 - vm.error = error;  
232 - vm.$log.error(error);  
233 - vm.loadingProposals = false;  
234 - });  
235 - } else {  
236 - vm.filtredProposals = []; 221 + params.parent_id = selectedProgram.id;
237 } 222 }
  223 +
  224 + if (query) {params.query = query; }
  225 +
  226 + vm.loadingProposals = true;
  227 + vm.DialogaService.searchProposals(params, function(data){
  228 + vm.total_proposals = parseInt(data._obj.headers('total'));
  229 + vm.filtredProposals = data.articles;
  230 + vm.loadingProposals = false;
  231 + }, function (error) {
  232 + vm.error = error;
  233 + vm.$log.error(error);
  234 + vm.loadingProposals = false;
  235 + });
238 }; 236 };
239 })(); 237 })();