Merge branch 'master' into feature/disable_account

Conflicts:
	users/app/controllers/users_controller.rb
	users/app/helpers/users_helper.rb
	users/app/views/users/edit.html.haml
	users/app/views/users/show.html.haml
	users/config/locales/en.yml

1 files changed, 12 insertions, 3 deletions

diff --git a/users/app/controllers/controller_extension/authentication.rb b/users/app/controllers/controller_extension/authentication.rb
index f0a6564..72df7a7 100644
--- a/users/app/controllers/controller_extension/authentication.rb
+++ b/users/app/controllers/controller_extension/authentication.rb
@@ -38,9 +38,18 @@ module ControllerExtension::Authentication
   end
 
   def access_denied
-    # TODO: should we redirect to the root_url in either case, and have the root_url include the login screen (and also ability to create unauthenticated tickets) when no user is logged in?
-    redirect_to login_url, :alert => "Not authorized" if !logged_in?
-    redirect_to root_url, :alert => "Not authorized" if logged_in?
+    respond_to do |format|
+      format.html do
+        if logged_in?
+          redirect_to root_url, :alert => t(:not_authorized)
+        else
+          redirect_to login_url, :alert => t(:not_authorized_login)
+        end
+      end
+      format.json do
+        render :json => {'error' => t(:not_authorized)}, status: :unprocessable_entity
+      end
+    end
   end
 
   def admin?