Commit 57303f2a0cb2e3857c52206bd3d95bef2bc0ae1d
Exists in
master
and in
4 other branches
Merge branch 'correcoes-programas'
Showing
3 changed files
with
6 additions
and
5 deletions
Show diff stats
src/app/components/proposal-box/proposal-box.directive.js
src/app/components/proposal-carousel/proposal-carousel.directive.js
... | ... | @@ -68,10 +68,9 @@ |
68 | 68 | ProposalCarouselController.prototype.showContent = function (proposal) { |
69 | 69 | var vm = this; |
70 | 70 | console.log(proposal); |
71 | - console.log("proposal"); | |
72 | 71 | vm.$state.go('programa', { |
73 | 72 | slug: proposal.parent.slug, |
74 | - proposal_id: proposal.id | |
73 | + proposal_id: proposal.proposal_id | |
75 | 74 | }, { |
76 | 75 | location: true, |
77 | 76 | reload: true |
... | ... | @@ -94,4 +93,4 @@ |
94 | 93 | return directive; |
95 | 94 | } |
96 | 95 | |
97 | 96 | -})(); |
97 | +})(); | |
98 | 98 | \ No newline at end of file | ... | ... |
src/app/pages/programas/programa.html
... | ... | @@ -142,8 +142,8 @@ |
142 | 142 | <proposal-list proposals="pagePrograma.proposalsTopFive" archived="pagePrograma.article.archived"></proposal-list> |
143 | 143 | <div class="row text-center"> |
144 | 144 | <div class="col-xs-12"> |
145 | - <a ui-sref="ranking({tema: pagePrograma.category.slug, programa: pagePrograma.article.slug})" class="btn btn-link"> | |
146 | - <span ng-if="pagePrograma.total_proposals > 5">Veja todas as {{pagePrograma.total_proposals}} propostas</span> | |
145 | + <a ng-show="pagePrograma.total_proposals > 5" ui-sref="ranking({tema: pagePrograma.category.slug, programa: pagePrograma.article.slug})" class="btn btn-link"> | |
146 | + <span>Veja todas as {{pagePrograma.total_proposals}} propostas</span> | |
147 | 147 | </a> |
148 | 148 | </div> |
149 | 149 | </div> | ... | ... |