Download as
Browse Code »

Commit c972f5e3e89baff0635de9f520c4eb48216e143e

Authored by Leandro Santos
2 parents 72f9ed1d b8d002a6
Exists in master and in 6 other branches feature-captcha, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'master' into staging

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 @c972f5e
... ... @@ -39,7 +39,7 @@
39 39 }else{
40 40 // load main content
41 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 43 'content_type':'ProposalsDiscussionPlugin::DiscussionTopic'
44 44 }, function (data){
45 45 CACHE.home = data;
... ...
src/app/pages/programas/programa.controller.js
  Diff comments   View file @c972f5e
... ... @@ -81,11 +81,12 @@
81 81 vm.article.bodyTrusted = vm.$sce.trustAsHtml(vm.article.body);
82 82 }
83 83  
  84 +
84 85 vm.loadingTopProposals = true;
85 86 vm.DialogaService.getProposalsByTopicId(vm.article.id, {
86 87 'limit': 5
87 88 }, function(data) {
88   - vm.total_proposals = parseInt(data._obj.headers('total'));
  89 + vm.total_proposals = parseInt(vm.article.amount_of_children);
89 90 vm.proposals = data.articles;
90 91 vm.proposalsTopFive = vm.proposals.slice(0, 5);
91 92 vm.proposalsTopRated = vm.proposals.slice(0, 3);
... ...
src/app/pages/programas/programa.html
  Diff comments   View file @c972f5e
... ... @@ -137,11 +137,10 @@
137 137 </div>
138 138 <div class="proposal-extended-section-content">
139 139 <proposal-list proposals="pagePrograma.proposalsTopFive"></proposal-list>
140   - <div class="row">
  140 + <div class="row text-center">
141 141 <div class="col-xs-12">
142 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 144 </a>
146 145 </div>
147 146 </div>
... ...