guest user
This commit is contained in:
1 parent
7c57c947c7
commit
45ef7fd302
25 files changed
+159
-70
No files matched your search
@@ -1,8 +1,10 @@
|
||||
class Admin::AdBannersController < OrbitBackendController
|
||||
layout "new_admin"
|
||||
before_filter :authenticate_user!
|
||||
before_filter :force_order_for_visitor,:only=>[:index]
|
||||
#before_filter :force_order_for_user,:except => [:index]
|
||||
before_filter :for_app_sub_manager,:except => [:index]
|
||||
before_filter :for_app_manager,:except => [:index,:show,:update,:realtime_preview]
|
||||
before_filter :for_app_sub_manager
|
||||
|
||||
|
||||
def rename
|
||||
@ad_banner = AdBanner.find(params[:id])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
class Admin::DashboardsController < ApplicationController
|
||||
|
||||
class Admin::DashboardsController < OrbitBackendController
|
||||
layout "new_admin"
|
||||
before_filter :authenticate_user!
|
||||
#before_filter :set_current_user
|
||||
#before_filter :authenticate_user!, :except => [:index]
|
||||
# before_filter :is_admin?
|
||||
|
||||
def index
|
||||
|
||||
@@ -1,9 +1,13 @@
|
||||
class Admin::TagsController < ApplicationController
|
||||
class Admin::TagsController < OrbitBackendController
|
||||
before_filter :force_order_for_visitor,:only=>[:index]
|
||||
before_filter :force_order_for_user,:except => [:index]
|
||||
before_filter :for_app_sub_manager,:except => [:index]
|
||||
|
||||
layout 'new_admin'
|
||||
before_filter :authenticate_user!
|
||||
before_filter :is_admin?
|
||||
before_filter :set_module_app
|
||||
|
||||
# layout 'new_admin'
|
||||
# before_filter :authenticate_user!
|
||||
# before_filter :is_admin?
|
||||
# before_filter :set_module_app
|
||||
|
||||
def index
|
||||
get_tags
|
||||
|
||||
@@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base
|
||||
before_filter :set_locale, :set_site
|
||||
|
||||
def set_current_user
|
||||
User.current = current_user
|
||||
User.current = current_or_guest_user
|
||||
end
|
||||
|
||||
def front_end_available(module_app_title='')
|
||||
@@ -50,11 +50,26 @@ class ApplicationController < ActionController::Base
|
||||
|
||||
# Check if the current_user is admin
|
||||
def is_admin?
|
||||
current_user.admin? ? true : auth_failed_in_backend
|
||||
current_or_guest_user.admin? ? true : auth_failed_in_backend
|
||||
end
|
||||
|
||||
def is_manager?
|
||||
@module_app.managing_users.include?(current_user) || is_admin?
|
||||
@module_app.is_manager?(current_or_guest_user) || is_admin?
|
||||
end
|
||||
|
||||
# Check if the current_user is admin
|
||||
def is_member?
|
||||
if (current_user rescue false)
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
def is_guest?
|
||||
if session[:guest_user_id]
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
def for_admin_only
|
||||
@@ -76,7 +91,7 @@ class ApplicationController < ActionController::Base
|
||||
end
|
||||
|
||||
def for_app_sub_manager
|
||||
if (@module_app.sub_managing_users.include?(current_user) || is_manager?)
|
||||
if (@module_app.sub_managing_users.include?(current_or_guest_user) || is_manager?)
|
||||
true
|
||||
else
|
||||
flash[:error] = t("admin.access.denied.app.not_sub_manager")
|
||||
@@ -85,7 +100,7 @@ class ApplicationController < ActionController::Base
|
||||
end
|
||||
|
||||
def for_app_user
|
||||
if (@module_app.app_auth.auth_users.include?(current_user) || for_app_sub_manager )
|
||||
if (@module_app.app_auth.auth_users.include?(current_or_guest_user) || for_app_sub_manager )
|
||||
true
|
||||
else
|
||||
flash[:error] = t("admin.access.denied.app.not_authed_user")
|
||||
@@ -95,7 +110,7 @@ class ApplicationController < ActionController::Base
|
||||
|
||||
def check_object_premission(obj,title)
|
||||
flash[:error] = t("admin.access.denied.object")
|
||||
auth_failed_in_backend unless (obj.get_object_auth_by_title(title).auth_users.include?(current_user) || is_manager? || is_admin? )
|
||||
auth_failed_in_backend unless (obj.get_object_auth_by_title(title).auth_users.include?(current_or_guest_user) || is_manager? || is_admin? )
|
||||
end
|
||||
|
||||
# Render the page
|
||||
@@ -189,6 +204,17 @@ class ApplicationController < ActionController::Base
|
||||
[shift_out] + a
|
||||
end
|
||||
end
|
||||
# called (once) when the user logs in, insert any code your application needs
|
||||
# to hand off from guest_user to current_user.
|
||||
def logging_in
|
||||
# For example:
|
||||
# guest_comments = guest_user.comments.all
|
||||
# guest_comments.each do |comment|
|
||||
# comment.user_id = current_user.id
|
||||
# comment.save
|
||||
# end
|
||||
end
|
||||
|
||||
|
||||
def render_main_rss
|
||||
ret = ''
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
class OrbitBackendController< ApplicationController
|
||||
before_filter :force_order,:except => [:public]
|
||||
before_filter :setup_vars
|
||||
before_filter :set_current_user
|
||||
#before_filter :setup_vars
|
||||
#before_filter :set_current_user
|
||||
|
||||
# before_filter {|c| c.front_end_available(@app_title)}
|
||||
# before_filter :check_user_can_use
|
||||
include OrbitCoreLib::PermissionUnility
|
||||
include AdminHelper
|
||||
include ApplicationHelper
|
||||
|
||||
layout 'new_admin'
|
||||
|
||||
@@ -18,8 +18,16 @@ class OrbitBackendController< ApplicationController
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def force_order
|
||||
|
||||
def force_order_for_visitor
|
||||
setup_vars
|
||||
set_current_user
|
||||
end
|
||||
|
||||
|
||||
def force_order_for_user
|
||||
setup_vars
|
||||
set_current_user
|
||||
authenticate_user!
|
||||
check_user_can_use
|
||||
end
|
||||
|
||||
Reference in new issue
Block a user