dev_admin
cxt 6 years ago
parent a9669387dc
commit 8db1823226

@ -3,7 +3,7 @@ class MemosController < ApplicationController
before_action :set_memo, only: [:show, :edit, :update, :destroy, :sticky_or_cancel, :hidden, :more_reply] before_action :set_memo, only: [:show, :edit, :update, :destroy, :sticky_or_cancel, :hidden, :more_reply]
before_action :validate_memo_params, only: [:create, :update] before_action :validate_memo_params, only: [:create, :update]
before_action :owner_or_admin, only: [:edit, :update, :destroy] before_action :owner_or_admin, only: [:edit, :update, :destroy]
before_action :is_admin, only: [:sticky_or_cancel, :hidden] before_action :require_business, only: [:sticky_or_cancel, :hidden]
include ApplicationHelper include ApplicationHelper
# GET /memos # GET /memos
@ -132,7 +132,7 @@ class MemosController < ApplicationController
def hidden def hidden
tip_exception("不能对主贴进行隐藏操作") if @memo.parent_id.nil? tip_exception("不能对主贴进行隐藏操作") if @memo.parent_id.nil?
begin begin
@memo.update_attributes!(hidden: !@memo.hidden) @memo.update_attributes!(hidden: @memo.hidden == 0 ? 1 : 0)
normal_status("更新成功") normal_status("更新成功")
rescue Exception => e rescue Exception => e
tip_exception("更新失败,原因:#{e}") tip_exception("更新失败,原因:#{e}")
@ -182,10 +182,6 @@ class MemosController < ApplicationController
tip_exception(403, "无权限操作") unless @memo.author == current_user || current_user.admin? || current_user.business? tip_exception(403, "无权限操作") unless @memo.author == current_user || current_user.admin? || current_user.business?
end end
def is_admin
tip_exception(403, "无权限操作") unless current_user.admin? || current_user.business?
end
# Never trust parameters from the scary internet, only allow the white list through. # Never trust parameters from the scary internet, only allow the white list through.
def memo_params def memo_params
params.require(:memo).permit(:subject, :content, :forum_id) params.require(:memo).permit(:subject, :content, :forum_id)

Binary file not shown.
Loading…
Cancel
Save