Merge pull request #1064 from taigaio/show-server-errors-on-memberships-add

Show server errors on memberships add
stable
Juanfran 2016-07-04 12:45:50 +02:00 committed by GitHub
commit 5eee1458c8
2 changed files with 11 additions and 1 deletions

View File

@ -99,7 +99,14 @@ class LightboxAddMembersController
_onErrorInvite: (response) -> _onErrorInvite: (response) ->
@.submitInvites = false @.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 if response.data._error_message
@confirm.notify("error", response.data._error_message) @confirm.notify("error", response.data._error_message)

View File

@ -10,6 +10,7 @@ tg-lightbox-close
required required
placeholder="{{'LIGHTBOX.CREATE_MEMBER.PLACEHOLDER_TYPE_EMAIL' | translate}}" placeholder="{{'LIGHTBOX.CREATE_MEMBER.PLACEHOLDER_TYPE_EMAIL' | translate}}"
data-required="true" data-required="true"
name="email-{{$index}}"
data-type="email" data-type="email"
ng-model="member.email" ng-model="member.email"
) )
@ -17,12 +18,14 @@ tg-lightbox-close
ng-if="!$first" ng-if="!$first"
type="email" type="email"
placeholder="{{'LIGHTBOX.CREATE_MEMBER.PLACEHOLDER_TYPE_EMAIL' | translate}}" placeholder="{{'LIGHTBOX.CREATE_MEMBER.PLACEHOLDER_TYPE_EMAIL' | translate}}"
name="email-{{$index}}"
data-type="email" data-type="email"
ng-model="member.email" ng-model="member.email"
) )
fieldset fieldset
select( select(
ng-if="vm.project" ng-if="vm.project"
name="role-{{$index}}"
ng-model="member.role_id" ng-model="member.role_id"
ng-options="role.id as role.name for role in vm.project.roles" ng-options="role.id as role.name for role in vm.project.roles"
) )