Download as
Browse Code »

Commit b8d002a63a4dbbcccee061092c18df0f7ff29d9c

Authored by Leandro Santos
1 parent aa82dfeb
Exists in master and in 6 other branches feature-captcha, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

fix ranking information of proposals

Showing 3 changed files with 5 additions and 5 deletions   Show diff stats
src/app/components/dialoga-service/dialoga.service.js
  Diff comments   View file @b8d002a
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 }else{ 39 }else{
40 // load main content 40 // load main content
41 ArticleService.getArticleById(API.articleId.home, { 41 ArticleService.getArticleById(API.articleId.home, {
42 - 'fields[]': ['id','abstract','body','categories','children','children_count','title','slug','image','url'], 42 + 'fields[]': ['id','abstract','body','categories','children','children_count','title','slug','image','url', 'amount_of_children'],
43 'content_type':'ProposalsDiscussionPlugin::DiscussionTopic' 43 'content_type':'ProposalsDiscussionPlugin::DiscussionTopic'
44 }, function (data){ 44 }, function (data){
45 CACHE.home = data; 45 CACHE.home = data;
src/app/pages/programas/programa.controller.js
  Diff comments   View file @b8d002a
@@ -81,11 +81,12 @@ @@ -81,11 +81,12 @@
81 vm.article.bodyTrusted = vm.$sce.trustAsHtml(vm.article.body); 81 vm.article.bodyTrusted = vm.$sce.trustAsHtml(vm.article.body);
82 } 82 }
83 83
  84 +
84 vm.loadingTopProposals = true; 85 vm.loadingTopProposals = true;
85 vm.DialogaService.getProposalsByTopicId(vm.article.id, { 86 vm.DialogaService.getProposalsByTopicId(vm.article.id, {
86 'limit': 5 87 'limit': 5
87 }, function(data) { 88 }, function(data) {
88 - vm.total_proposals = parseInt(data._obj.headers('total')); 89 + vm.total_proposals = parseInt(vm.article.amount_of_children);
89 vm.proposals = data.articles; 90 vm.proposals = data.articles;
90 vm.proposalsTopFive = vm.proposals.slice(0, 5); 91 vm.proposalsTopFive = vm.proposals.slice(0, 5);
91 vm.proposalsTopRated = vm.proposals.slice(0, 3); 92 vm.proposalsTopRated = vm.proposals.slice(0, 3);
src/app/pages/programas/programa.html
  Diff comments   View file @b8d002a
@@ -137,11 +137,10 @@ @@ -137,11 +137,10 @@
137 </div> 137 </div>
138 <div class="proposal-extended-section-content"> 138 <div class="proposal-extended-section-content">
139 <proposal-list proposals="pagePrograma.proposalsTopFive"></proposal-list> 139 <proposal-list proposals="pagePrograma.proposalsTopFive"></proposal-list>
140 - <div class="row"> 140 + <div class="row text-center">
141 <div class="col-xs-12"> 141 <div class="col-xs-12">
142 <a ui-sref="ranking({tema: pagePrograma.category.slug, programa: pagePrograma.article.slug})" class="btn btn-link"> 142 <a ui-sref="ranking({tema: pagePrograma.category.slug, programa: pagePrograma.article.slug})" class="btn btn-link">
143 - <span ng-if="pagePrograma.proposals.length > 1">Veja todas as {{pagePrograma.total_proposals}} propostas</span>  
144 - <span ng-if="pagePrograma.proposals.length === 1">Ir para a página de ranking</span> 143 + <span ng-if="pagePrograma.total_proposals > 5">Veja todas as {{pagePrograma.total_proposals}} propostas</span>
145 </a> 144 </a>
146 </div> 145 </div>
147 </div> 146 </div>