From 5ea6542805b8a44ad26d29b790fc6eb569147c10 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sun, 4 Aug 2013 23:38:53 +0200 Subject: [PATCH] Fixed error code of failed login. --- app/assets/javascripts/app/lib/app_post/ajax.js.coffee | 2 +- app/controllers/sessions_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/lib/app_post/ajax.js.coffee b/app/assets/javascripts/app/lib/app_post/ajax.js.coffee index 6161b1685..6a0c8512c 100644 --- a/app/assets/javascripts/app/lib/app_post/ajax.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/ajax.js.coffee @@ -43,7 +43,7 @@ class _ajaxSingleton return if status is 0 # do not show any error message on wrong login - return if status is 422 + return if status is 401 && !settings.url.match('login') # do not show any error message with code 200 return if status is 200 diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 3df9f04c9..d1798608b 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -13,7 +13,7 @@ class SessionsController < ApplicationController # auth failed if !user - render :json => { :error => 'login failed' }, :status => :unprocessable_entity + render :json => { :error => 'login failed' }, :status => :unauthorized return end