Download as
Browse Code »

Commit dd8532092e6a2aa4f7bfbe46055fc72d9d1f3b57

Authored by Leonardo Merlin
2 parents 74d16c65 51ee4ec6
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 3 additions and 15 deletions   Show diff stats
src/app/components/article-service/article.service.js
  Diff comments   View file @dd85320
@@ -221,7 +221,7 @@ @@ -221,7 +221,7 @@
221 } 221 }
222 222
223 function sendContactForm (community_id, data){ 223 function sendContactForm (community_id, data){
224 - var url = service.apiCommunities + community_id + '/contact' 224 + var url = service.apiCommunities + community_id + '/contact';
225 var encodedParams = [ 225 var encodedParams = [
226 'contact[name]=' + data.name, 226 'contact[name]=' + data.name,
227 'contact[email]=' + data.email, 227 'contact[email]=' + data.email,
src/app/pages/duvidas/duvidas.controller.js
  Diff comments   View file @dd85320
@@ -34,14 +34,7 @@ @@ -34,14 +34,7 @@
34 }; 34 };
35 35
36 DuvidasPageController.prototype.loadData = function () { 36 DuvidasPageController.prototype.loadData = function () {
37 - var vm = this;  
38 -  
39 - // vm.DialogaService.getQuestions(function(questions){  
40 - // vm.questions = questions;  
41 - // }, function (error) {  
42 - // vm.error = error;  
43 - // vm.$log.error(error);  
44 - // }); 37 + // var vm = this;
45 }; 38 };
46 39
47 DuvidasPageController.prototype.submitContactForm = function ($event, contactForm) { 40 DuvidasPageController.prototype.submitContactForm = function ($event, contactForm) {
@@ -59,7 +52,7 @@ @@ -59,7 +52,7 @@
59 52
60 vm.DialogaService.sendContactForm(data) 53 vm.DialogaService.sendContactForm(data)
61 .then(function(response){ 54 .then(function(response){
62 - // vm.$log.debug('sendContactForm success', response); 55 + vm.$log.debug('sendContactForm success', response);
63 vm.successMessage = 'Mensagem enviada com sucesso!'; 56 vm.successMessage = 'Mensagem enviada com sucesso!';
64 }, function(response){ 57 }, function(response){
65 vm.$log.warn('sendContactForm error', response); 58 vm.$log.warn('sendContactForm error', response);
src/app/pages/programas/programa.controller.js
  Diff comments   View file @dd85320
@@ -205,11 +205,6 @@ @@ -205,11 +205,6 @@
205 return; 205 return;
206 } 206 }
207 207
208 - if (!vm.$rootScope.temporaryToken) {  
209 - vm.$log.debug('"temporaryToken" not defined. Abort.');  
210 - return;  
211 - }  
212 -  
213 vm.DialogaService.voteProposal(proposal_id, { 208 vm.DialogaService.voteProposal(proposal_id, {
214 value: value 209 value: value
215 }).then(function(response) { 210 }).then(function(response) {