Merge branch 'master' into staging

98287028191
2 parents f70a7884 37028c06
Showing 3 changed files with 24 additions and 1 deletions Show diff stats
envia-repo.sh
src/app/components/proposal-box/proposal-box.html
src/app/pages/respostas/respostas.controller.js
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+git push origin master
+
+git checkout staging
+git pull origin staging
+
+git merge master
 \ No newline at end of file
@@ -141,7 +141,8 @@
     <div class="proposal-box--program color-theme-bg">{{vm.topic.title}}</div>
     <!-- Apagar o bloco abaixo -->
-    <span style="background: green;">{{::vm.proposal}}
+    <!-- <span style="background: green;">{{::vm.proposal}} -->
+    
   </div>
   <div class="proposal-box--middle">
     <div class="proposal-box--content">
@@ -79,6 +79,20 @@
       vm.loading = false;
       vm.filter();
+
+
+      // HACK: get image from body 'proposal'
+      // remove tags html
+      for (var j = vm.proposals.length - 1; j >= 0; j--) {
+          var proposalImg = vm.proposals[j];
+          if (proposalImg && proposalImg.body && proposalImg.body.length > 0) {
+              proposalImg.body = String(proposalImg.body).replace(/<[^>]+>/gm, '');
+          }else{
+              proposalImg.body = vm.banner.src;
+          }
+      }  
+
+
     }, function(error) {
       vm.error = error;
       vm.$log.error(error);
	@@ -0,0 +1,8 @@		@@ -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	\ No newline at end of file	9	\ No newline at end of file
	@@ -79,6 +79,20 @@		@@ -79,6 +79,20 @@
79	vm.loading = false;	79	vm.loading = false;
80		80
81	vm.filter();	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	}, function(error) {	96	}, function(error) {
83	vm.error = error;	97	vm.error = error;
84	vm.$log.error(error);	98	vm.$log.error(error);