From 45e987d6f5712830e871e3cdf684cfebdf4a558d Mon Sep 17 00:00:00 2001
From: chris <chris.vilayphiou@gmail.com>
Date: Fri, 23 Aug 2013 12:08:33 +0800
Subject: [PATCH] Fix for authorization Dashboard and page authorisation

---
 app/controllers/admin/dashboards_controller.rb              | 6 +-----
 lib/orbit_core_lib.rb                                       | 6 ++----
 .../panel/page_content/back_end/page_contexts_controller.rb | 4 +---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/controllers/admin/dashboards_controller.rb b/app/controllers/admin/dashboards_controller.rb
index d559a87c..c0acaf8d 100644
--- a/app/controllers/admin/dashboards_controller.rb
+++ b/app/controllers/admin/dashboards_controller.rb
@@ -1,11 +1,7 @@
 class Admin::DashboardsController < OrbitBackendController
 
-  #before_filter :set_current_user
-  #before_filter :authenticate_user!, :except => [:index]
-#  before_filter :is_admin?
+  open_for_visitor
 
-  #prepend_before_filter :set_public
-  
   layout "basic_back_end"
   
   def index
diff --git a/lib/orbit_core_lib.rb b/lib/orbit_core_lib.rb
index 66ed5953..918f43f8 100644
--- a/lib/orbit_core_lib.rb
+++ b/lib/orbit_core_lib.rb
@@ -202,6 +202,8 @@ module  OrbitCoreLib
     module InstanceMethods
       protected
       def can_use
+        setup_vars
+        set_current_user
         if @user_type
           @user_type.each do |user_type|
             open = false
@@ -220,14 +222,10 @@ module  OrbitCoreLib
               visitor ||= true
             end
             check_backend_openness if visitor
-            setup_vars
-            set_current_user
             authenticate_user! unless visitor
             redirect_to root_url unless open
           end
         else
-          setup_vars
-          set_current_user
           authenticate_user!
           check_user_can_use
         end
diff --git a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
index 8c4528c8..644c5dbd 100644
--- a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
+++ b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
@@ -1,8 +1,6 @@
 class Panel::PageContent::BackEnd::PageContextsController < OrbitBackendController
 
-  prepend_before_filter :set_public, :only => [:index]
-   
-  #before_filter :is_admin?
+  open_for_visitor :only => [:index]
 
   def index
 	@page_contexts =  (params.has_key?:sort)?  get_sorted_and_filtered("page_contexts", {:archived => false}) : get_sorted_page_from_structure