Commit 9ceabad78a95f4ffa5a778a617c1750f3fac1e63
Exists in
master
and in
4 other branches
Merge branch 'bug-respostas'
Showing
2 changed files
with
3 additions
and
4 deletions
Show diff stats
src/app/pages/programas/programa.controller.js
| @@ -90,11 +90,10 @@ | @@ -90,11 +90,10 @@ | ||
| 90 | // vm.total_proposals = parseInt(vm.article.amount_of_children); // DEPRECATED?! | 90 | // vm.total_proposals = parseInt(vm.article.amount_of_children); // DEPRECATED?! |
| 91 | if (data.articles) { | 91 | if (data.articles) { |
| 92 | vm.proposals = data.articles; | 92 | vm.proposals = data.articles; |
| 93 | - console.log("1"); | ||
| 94 | } else { | 93 | } else { |
| 95 | vm.proposals = data.proposals; | 94 | vm.proposals = data.proposals; |
| 96 | - console.log("2"); | ||
| 97 | } | 95 | } |
| 96 | + console.log("-------------",vm.proposals); | ||
| 98 | vm.proposalsTopFive = vm.proposals.slice(0, 5); | 97 | vm.proposalsTopFive = vm.proposals.slice(0, 5); |
| 99 | vm.proposalsTopRated = vm.proposals.slice(0, 3); | 98 | vm.proposalsTopRated = vm.proposals.slice(0, 3); |
| 100 | vm.loadingTopProposals = false; | 99 | vm.loadingTopProposals = false; |
src/app/pages/respostas/respostas.controller.js
| @@ -169,6 +169,7 @@ | @@ -169,6 +169,7 @@ | ||
| 169 | var params = { | 169 | var params = { |
| 170 | page: page, | 170 | page: page, |
| 171 | per_page: per_page, | 171 | per_page: per_page, |
| 172 | + has_children: true, | ||
| 172 | 'fields[]': [ | 173 | 'fields[]': [ |
| 173 | 'id', | 174 | 'id', |
| 174 | 'body', | 175 | 'body', |
| @@ -185,7 +186,6 @@ | @@ -185,7 +186,6 @@ | ||
| 185 | 'image', | 186 | 'image', |
| 186 | 'title', | 187 | 'title', |
| 187 | 'archived', | 188 | 'archived', |
| 188 | - 'has_children=true', | ||
| 189 | ] | 189 | ] |
| 190 | }; | 190 | }; |
| 191 | 191 | ||
| @@ -222,4 +222,4 @@ | @@ -222,4 +222,4 @@ | ||
| 222 | } | 222 | } |
| 223 | }; | 223 | }; |
| 224 | 224 | ||
| 225 | -})(); | 225 | -})(); |
| 226 | +})(); | ||
| 226 | \ No newline at end of file | 227 | \ No newline at end of file |