Download as
Browse Code »

Commit 33b66129e3d85e025da484940075457471dffe93

Authored by 98287028191
2 parents f70a7884 37028c06
Exists in master and in 4 other branches feature-captcha, production, staging, the_glorious_return_of_piwik

Merge branch 'master' into staging

Showing 3 changed files with 24 additions and 1 deletions   Show diff stats
envia-repo.sh 0 → 100755
  Diff comments   View file @33b6612
... ... @@ -0,0 +1,8 @@
  1 +#!/bin/sh
  2 +
  3 +git push origin master
  4 +
  5 +git checkout staging
  6 +git pull origin staging
  7 +
  8 +git merge master
0 9 \ No newline at end of file
... ...
src/app/components/proposal-box/proposal-box.html
  Diff comments   View file @33b6612
... ... @@ -141,7 +141,8 @@
141 141 <div class="proposal-box--program color-theme-bg">{{vm.topic.title}}</div>
142 142  
143 143 <!-- Apagar o bloco abaixo -->
144   - <span style="background: green;">{{::vm.proposal}}
  144 + <!-- <span style="background: green;">{{::vm.proposal}} -->
  145 +
145 146 </div>
146 147 <div class="proposal-box--middle">
147 148 <div class="proposal-box--content">
... ...
src/app/pages/respostas/respostas.controller.js
  Diff comments   View file @33b6612
... ... @@ -79,6 +79,20 @@
79 79 vm.loading = false;
80 80  
81 81 vm.filter();
  82 +
  83 +
  84 + // HACK: get image from body 'proposal'
  85 + // remove tags html
  86 + for (var j = vm.proposals.length - 1; j >= 0; j--) {
  87 + var proposalImg = vm.proposals[j];
  88 + if (proposalImg && proposalImg.body && proposalImg.body.length > 0) {
  89 + proposalImg.body = String(proposalImg.body).replace(/<[^>]+>/gm, '');
  90 + }else{
  91 + proposalImg.body = vm.banner.src;
  92 + }
  93 + }
  94 +
  95 +
82 96 }, function(error) {
83 97 vm.error = error;
84 98 vm.$log.error(error);
... ...