diff --git a/src/app/components/article-service/article.service.js b/src/app/components/article-service/article.service.js index 44f3e56..196553b 100644 --- a/src/app/components/article-service/article.service.js +++ b/src/app/components/article-service/article.service.js @@ -146,6 +146,9 @@ var url = service.apiProposals + targetId + '/propose'; var encodedParams = []; + encodedParams.push('article%5Babstract%5D=' + proposal); + encodedParams.push('article%5Btype%5D=ProposalsDiscussionPlugin%3A%3AProposal'); + encodedParams.push('content_type=ProposalsDiscussionPlugin%3A%3AProposal'); encodedParams.push('private_token=' + $rootScope.currentUser.private_token); encodedParams.push('fields=id'); encodedParams.push('article[name]=article_' + GUID.generate()); diff --git a/src/app/components/util-service/utils.service.js b/src/app/components/util-service/utils.service.js index c646ad9..f6b5a79 100644 --- a/src/app/components/util-service/utils.service.js +++ b/src/app/components/util-service/utils.service.js @@ -68,7 +68,7 @@ // nomralized format. However, if the request was not handled by the // server (or what not handles properly - ex. server error), then we // may have to normalize it on our end, as best we can. - if (!angular.isObject(error.data) || !error.data.message) { + if (!angular.isObject(error.data)) { return $q.reject('An unknown error occurred.'); } diff --git a/src/app/pages/programas/programa.controller.js b/src/app/pages/programas/programa.controller.js index 6a4caba..d30366c 100644 --- a/src/app/pages/programas/programa.controller.js +++ b/src/app/pages/programas/programa.controller.js @@ -122,10 +122,22 @@ vm.DialogaService.createProposal(proposal, vm.article.id, function(response) { vm.$log.debug('response', response); + // vm.message = // vm.proposalStatus = vm.PROPOSAL_STATUS.SENT | vm.PROPOSAL_STATUS.SUCCESS; vm.proposalStatus = vm.PROPOSAL_STATUS.SUCCESS; }, function(error) { vm.$log.error(error); + + vm.error = error; + + if (vm.error.code === 400){ + // Bad Request + vm.error.message = ''; + vm.error.message += 'Não foi possível enviar a proposta.
'; + vm.error.message += 'Este problema já foi registrado em nossos servidores.
'; + vm.error.message += 'Por favor, tente novamente mais tarde.'; + } + // vm.proposalStatus = vm.PROPOSAL_STATUS.SENT | vm.PROPOSAL_STATUS.ERROR; vm.proposalStatus = vm.PROPOSAL_STATUS.ERROR; }); diff --git a/src/app/pages/programas/programa.html b/src/app/pages/programas/programa.html index 266c340..adcac97 100644 --- a/src/app/pages/programas/programa.html +++ b/src/app/pages/programas/programa.html @@ -152,8 +152,8 @@
@@ -167,8 +167,26 @@
+
+
+
+ +
+
+
+
+ Enviando... +
+
+
@@ -179,7 +197,6 @@
-
-- libgit2 0.21.2