Merge branch '3.5.0-devel-auth' into 3.5.2-devel

rism-digital · Aug 10, 2016 · 5983dd8 · 5983dd8
2 parents 43c65bc + bdc95fb
commit 5983dd8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -10,7 +10,11 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
-  before_filter :set_locale, :set_paper_trail_whodunnit
+  before_filter :set_locale, :set_paper_trail_whodunnit, :auth_user
+
+  def auth_user
+    redirect_to "/admin/login" unless (request.path == "/admin/login" or user_signed_in?)
+  end
 
   # Code for rescueing lock conflicts errors
   rescue_from ActiveRecord::StaleObjectError do |exception|