taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #526 from taigaio/issue/2877/confusing-duplicated-username-error-in-invation-register 

show the back error message and set it inline if it is needed
stable
David Barragán Merino 2015-06-17 12:29:03 +02:00
parent e29ec15101 e6cf655388
commit b9dd47b47b
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/coffee/modules/auth.coffee
View File

@ -260,9 +260,9 @@ RegisterDirective = ($auth, $confirm, $location, $navUrls, $config, $analytics,
$location.path($navUrls.resolve("home")) $location.path($navUrls.resolve("home"))
onErrorSubmit = (response) -> onErrorSubmit = (response) ->
if response.data._error_message? if response.data._error_message
text = $translate.instant("LOGIN_FORM.ERROR_GENERIC") + " " + response.data._error_message text = $translate.instant("COMMON.GENERIC_ERROR", {error: response.data._error_message})
$confirm.notify("light-error", text + " " + response.data._error_message) $confirm.notify("light-error", text)
form.setErrors(response.data) form.setErrors(response.data)
@ -350,12 +350,10 @@ ChangePasswordFromRecoveryDirective = ($auth, $confirm, $location, $params, $nav
$location.path($navUrls.resolve("login")) $location.path($navUrls.resolve("login"))
text = $translate.instant("CHANGE_PASSWORD_RECOVERY_FORM.SUCCESS") text = $translate.instant("CHANGE_PASSWORD_RECOVERY_FORM.SUCCESS")
$confirm.success(text) $confirm.success(text)
onErrorSubmit = (response) -> onErrorSubmit = (response) ->
text = $translate.instant("COMMON.GENERIC_ERROR", {error: response.data._error_message}) text = $translate.instant("COMMON.GENERIC_ERROR", {error: response.data._error_message})
$confirm.notify("light-error", text) $confirm.notify("light-error", text)
submit = debounce 2000, (event) => submit = debounce 2000, (event) =>
@ -429,7 +427,7 @@ InvitationDirective = ($auth, $confirm, $location, $params, $navUrls, $analytics
# Register form # Register form
$scope.dataRegister = {token: token} $scope.dataRegister = {token: token}
registerForm = $el.find("form.register-form").checksley() registerForm = $el.find("form.register-form").checksley({onlyOneErrorElement: true})
onSuccessSubmitRegister = (response) -> onSuccessSubmitRegister = (response) ->
$analytics.trackEvent("auth", "invitationAccept", "invitation accept with new user", 1) $analytics.trackEvent("auth", "invitationAccept", "invitation accept with new user", 1)
@ -438,9 +436,11 @@ InvitationDirective = ($auth, $confirm, $location, $params, $navUrls, $analytics
"Welcome to #{_.escape($scope.invitation.project_name)}") "Welcome to #{_.escape($scope.invitation.project_name)}")
onErrorSubmitRegister = (response) -> onErrorSubmitRegister = (response) ->
text = $translate.instant("LOGIN_FORM.ERROR_AUTH_INCORRECT") if response.data._error_message
text = $translate.instant("COMMON.GENERIC_ERROR", {error: response.data._error_message})
$confirm.notify("light-error", text)
$confirm.notify("light-error", text) registerForm.setErrors(response.data)
submitRegister = debounce 2000, (event) => submitRegister = debounce 2000, (event) =>
event.preventDefault() event.preventDefault()

1
app/locales/locale-en.json
View File

@ -263,7 +263,6 @@
}, },
"LOGIN_FORM": { "LOGIN_FORM": {
"ERROR_AUTH_INCORRECT": "According to our Oompa Loompas, your username/email or password are incorrect.", "ERROR_AUTH_INCORRECT": "According to our Oompa Loompas, your username/email or password are incorrect.",
"ERROR_GENERIC": "According to our Oompa Loompas there was an error.",
"SUCCESS": "Our Oompa Loompas are happy, welcome to Taiga." "SUCCESS": "Our Oompa Loompas are happy, welcome to Taiga."
}, },
"REGISTER": { "REGISTER": {