update back end index list
This commit is contained in:
1 parent
ca2b66a210
commit
39386930ef
2 files changed
+18
-3
No files matched your search
@@ -25,7 +25,12 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
|
||||
@statuses = get_statuses
|
||||
category_ids = @categories.collect{|t| t.id}
|
||||
|
||||
@bulletins = get_sorted_and_filtered("bulletin", :category_id.in => category_ids)
|
||||
if is_manager? or is_admin?
|
||||
@bulletins = get_sorted_and_filtered("bulletin", :category_id.in => category_ids)
|
||||
else
|
||||
@bulletins = get_sorted_and_filtered("bulletin", {:category_id.in => category_ids, :create_user_id => current_user.id})
|
||||
end
|
||||
|
||||
respond_to do |format|
|
||||
format.html # index.html.erb
|
||||
format.js { }
|
||||
@@ -70,7 +75,8 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
|
||||
@tags = get_tags
|
||||
is_authorized_sub_manager = @bulletin.category.auth_sub_manager.authorized_user_ids rescue nil
|
||||
|
||||
if !(is_manager? || is_admin? || is_authorized_sub_manager.include?(current_user.id))
|
||||
if !(is_manager? || is_admin? || (is_authorized_sub_manager.include?(current_user.id) and @bulletin.create_user_id == current_user.id))
|
||||
|
||||
redirect_to :action => :index
|
||||
else
|
||||
# @summary_variable = @bulletin.summary_variable
|
||||
|
||||
Reference in new issue
Block a user