Download as
Browse Code »

Commit 4102f662f4722586cbec1e4b4e92c1fd06187658

Authored by Leonardo Merlin
2 parents ce00c2de 3e7217e8
Exists in master and in 6 other branches feature-captcha, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'fix-issues'

Showing 4 changed files with 68 additions and 52 deletions   Show diff stats
src/app/components/app-navbar/app-navbar.html
  Diff comments   View file @4102f66
... ... @@ -28,7 +28,7 @@
28 28 <li ui-sref-active="active"><a ui-sref="ranking">Ranking</a></li>
29 29 <li ui-sref-active="active"><a ui-sref="duvidas">Dúvidas</a></li>
30 30 <li role="separator" class="divider hidden-xs hidden-sm"><span>|</span></li>
31   - <li class="dropdown" style="border: none; margin: 20px 0;">
  31 + <li class="dropdown" style="border: none;">
32 32 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Compartilhar <span aria-hidden="true" class="icon icon-social-share-small"></span></a>
33 33 <social-share class="dropdown-menu dropdown-menu-right" arrow-class="social-share--arrow"></social-share>
34 34 <div class="clearfix"></div>
... ...
src/app/components/article-service/article.service.js
  Diff comments   View file @4102f66
... ... @@ -250,11 +250,25 @@
250 250  
251 251 function searchProposals (params, cbSuccess, cbError) {
252 252 // Ex.: /api/v1/search/article?type=ProposalsDiscussionPlugin::Proposal&query=cisternas
253   - var url = service.apiSearch + '/article';
  253 + var url = service.apiSearch + 'article';
254 254 var paramsExtended = angular.extend({
255 255 page: 1,
256   - per_page: 20,
257   - type: 'ProposalsDiscussionPlugin::Proposal'
  256 + per_page: 10,
  257 + type: 'ProposalsDiscussionPlugin::Proposal',
  258 + 'fields[]': [
  259 + 'id',
  260 + 'abstract',
  261 + 'hits',
  262 + 'ranking_position',
  263 + 'votes_against',
  264 + 'votes_count',
  265 + 'votes_for',
  266 + 'parent',
  267 + 'categories',
  268 + 'slug',
  269 + 'url', // parent.image.url
  270 + 'image',
  271 + ]
258 272 }, params);
259 273  
260 274 UtilService.get(url, {params: paramsExtended}).then(function(data){
... ...
src/app/pages/propostas/propostas.controller.js
  Diff comments   View file @4102f66
... ... @@ -28,7 +28,7 @@
28 28 var vm = this;
29 29  
30 30 vm.page = 1;
31   - vm.per_page = 20;
  31 + vm.per_page = 10;
32 32 vm.themes = null;
33 33 vm.selectedTheme = null;
34 34 vm.filtredPrograms = null;
... ... @@ -57,9 +57,11 @@
57 57 vm.loadingThemes = false;
58 58 vm.loading = false;
59 59  
60   - vm.loadProposals(function() {
61   - vm.attachListeners();
62   - });
  60 + // REMOVED: function called twice.
  61 + // vm.loadProposals(function() {
  62 + // vm.attachListeners();
  63 + // });
  64 + vm.attachListeners();
63 65 }, function(error) {
64 66 vm.error = error;
65 67 vm.$log.error(error);
... ... @@ -68,29 +70,29 @@
68 70 });
69 71 };
70 72  
71   - PropostasPageController.prototype.loadProposals = function(cb) {
72   - var vm = this;
73   -
74   - // load Proposals
75   - vm.loadingProposals = true;
76   - vm.DialogaService.searchProposals({
77   - page: vm.page,
78   - per_page: vm.per_page
79   - }, function(data) {
80   - vm.filtredProposals = data.articles;
81   - vm.total_proposals = parseInt(data._obj.headers('total'));
82   -
83   - vm.loadingProposals = false;
84   -
85   - if (cb) {
86   - cb();
87   - }
88   - }, function(error) {
89   - vm.error = error;
90   - vm.$log.error(error);
91   - vm.loadingProposals = false;
92   - });
93   - };
  73 + // PropostasPageController.prototype.loadProposals = function(cb) {
  74 + // var vm = this;
  75 +
  76 + // // load Proposals
  77 + // vm.loadingProposals = true;
  78 + // vm.DialogaService.searchProposals({
  79 + // page: vm.page,
  80 + // per_page: vm.per_page
  81 + // }, function(data) {
  82 + // vm.filtredProposals = data.articles;
  83 + // vm.total_proposals = parseInt(data._obj.headers('total'));
  84 +
  85 + // vm.loadingProposals = false;
  86 +
  87 + // if (cb) {
  88 + // cb();
  89 + // }
  90 + // }, function(error) {
  91 + // vm.error = error;
  92 + // vm.$log.error(error);
  93 + // vm.loadingProposals = false;
  94 + // });
  95 + // };
94 96  
95 97 PropostasPageController.prototype.attachListeners = function() {
96 98 var vm = this;
... ...
src/app/pages/ranking/ranking.controller.js
  Diff comments   View file @4102f66
... ... @@ -18,7 +18,7 @@
18 18  
19 19 vm.init();
20 20 vm.loadData();
21   - // vm.attachListeners(); // attach listeners after load data (SYNC)
  21 + vm.attachListeners(); // attach listeners after load data (SYNC)
22 22 vm.$rootScope.focusMainContent();
23 23  
24 24 $log.debug('RankingPageController');
... ... @@ -83,7 +83,7 @@
83 83 // (AND 4)
84 84 var themeId = vm.selectedTheme.id;
85 85 vm.loadPrograms(themeId, function(){
86   - vm.loadProposals();
  86 + // vm.loadProposals();
87 87 vm.loading = false;
88 88 });
89 89 }, function (error) {
... ... @@ -131,25 +131,25 @@
131 131 });
132 132 };
133 133  
134   - RankingPageController.prototype.loadProposals = function () {
135   - var vm = this;
136   -
137   - // load Proposals
138   - vm.loadingProposals = true;
139   - vm.DialogaService.getProposals({
140   - page: vm.page,
141   - per_page: vm.per_page
142   - }, function(data){
143   - vm.filtredProposals = data.articles;
144   - vm.loadingProposals = false;
145   -
146   - vm.attachListeners();
147   - }, function (error) {
148   - vm.error = error;
149   - vm.$log.error(error);
150   - vm.loadingProposals = false;
151   - });
152   - };
  134 + // RankingPageController.prototype.loadProposals = function () {
  135 + // var vm = this;
  136 +
  137 + // // load Proposals
  138 + // vm.loadingProposals = true;
  139 + // vm.DialogaService.getProposals({
  140 + // page: vm.page,
  141 + // per_page: vm.per_page
  142 + // }, function(data){
  143 + // vm.filtredProposals = data.articles;
  144 + // vm.loadingProposals = false;
  145 +
  146 + // vm.attachListeners();
  147 + // }, function (error) {
  148 + // vm.error = error;
  149 + // vm.$log.error(error);
  150 + // vm.loadingProposals = false;
  151 + // });
  152 + // };
153 153  
154 154 RankingPageController.prototype.attachListeners = function() {
155 155 var vm = this;
... ...