From 1a07a887b536cce3516fd0c7a80053cb7f742188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 29 Jun 2016 18:30:39 +0200 Subject: [PATCH] Show server errors on memberships add --- app/coffee/modules/admin/lightboxes.coffee | 9 ++++++++- app/partials/admin/lightbox-add-members.jade | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/coffee/modules/admin/lightboxes.coffee b/app/coffee/modules/admin/lightboxes.coffee index 4ff79aec..9802d72a 100644 --- a/app/coffee/modules/admin/lightboxes.coffee +++ b/app/coffee/modules/admin/lightboxes.coffee @@ -99,7 +99,14 @@ class LightboxAddMembersController _onErrorInvite: (response) -> @.submitInvites = false - @.form.setErrors(response.data) + errors = {} + _.each response.data.bulk_memberships, (value, index) => + if value.email + errors["email-#{index}"] = value.email[0] + if value.role + errors["role-#{index}"] = value.role[0] + + @.form.setErrors(errors) if response.data._error_message @confirm.notify("error", response.data._error_message) diff --git a/app/partials/admin/lightbox-add-members.jade b/app/partials/admin/lightbox-add-members.jade index dbdc66b4..9b8caa73 100644 --- a/app/partials/admin/lightbox-add-members.jade +++ b/app/partials/admin/lightbox-add-members.jade @@ -10,6 +10,7 @@ tg-lightbox-close required placeholder="{{'LIGHTBOX.CREATE_MEMBER.PLACEHOLDER_TYPE_EMAIL' | translate}}" data-required="true" + name="email-{{$index}}" data-type="email" ng-model="member.email" ) @@ -17,12 +18,14 @@ tg-lightbox-close ng-if="!$first" type="email" placeholder="{{'LIGHTBOX.CREATE_MEMBER.PLACEHOLDER_TYPE_EMAIL' | translate}}" + name="email-{{$index}}" data-type="email" ng-model="member.email" ) fieldset select( ng-if="vm.project" + name="role-{{$index}}" ng-model="member.role_id" ng-options="role.id as role.name for role in vm.project.roles" )