layout "site"
before_action :authorize_web
- before_action :require_user
- before_action :check_permission
+ before_action :set_locale
+
+ authorize_resource
+
before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore]
def index
@title = t ".title"
- if current_user.moderator?
- @issue_types = %w[Note]
- @users = User.joins(:roles).where(:user_roles => { :role => "moderator" })
- else
- @issue_types = %w[DiaryEntry DiaryComment User]
- @users = User.joins(:roles).where(:user_roles => { :role => "administrator" })
- end
+ @issue_types = []
+ @issue_types.concat %w[Note] if current_user.moderator?
+ @issue_types.concat %w[DiaryEntry DiaryComment User] if current_user.administrator?
- @issues = Issue.where(:assigned_role => current_user.roles.map(&:role))
+ @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct
+ @issues = Issue.visible_to(current_user)
# If search
- if params[:search_by_user] && params[:search_by_user].present?
+ if params[:search_by_user]&.present?
@find_user = User.find_by(:display_name => params[:search_by_user])
if @find_user
@issues = @issues.where(:reported_user_id => @find_user.id)
else
- notice = t("issues.index.user_not_found")
+ @issues = @issues.none
+ flash.now[:warning] = t(".user_not_found")
end
end
- @issues = @issues.where(:status => params[:status][0]) if params[:status] && params[:status][0].present?
+ @issues = @issues.where(:status => params[:status]) if params[:status]&.present?
- @issues = @issues.where(:reportable_type => params[:issue_type][0]) if params[:issue_type] && params[:issue_type][0].present?
+ @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type]&.present?
- if params[:last_updated_by] && params[:last_updated_by][0].present?
- last_updated_by = params[:last_updated_by][0].to_s == "nil" ? nil : params[:last_updated_by][0].to_i
+ if params[:last_updated_by]&.present?
+ last_updated_by = params[:last_updated_by].to_s == "nil" ? nil : params[:last_updated_by].to_i
@issues = @issues.where(:updated_by => last_updated_by)
end
-
- redirect_to issues_path, :notice => notice if notice
end
def show
def resolve
if @issue.resolve
@issue.save!
- redirect_to @issue, :notice => t("issues.resolved")
+ redirect_to @issue, :notice => t(".resolved")
else
render :show
end
if @issue.ignore
@issue.updated_by = current_user.id
@issue.save!
- redirect_to @issue, :notice => t("issues.ignored")
+ redirect_to @issue, :notice => t(".ignored")
else
render :show
end
if @issue.reopen
@issue.updated_by = current_user.id
@issue.save!
- redirect_to @issue, :notice => t("issues.reopened")
+ redirect_to @issue, :notice => t(".reopened")
else
render :show
end
def find_issue
@issue = Issue.find(params[:id])
end
-
- def check_permission
- unless current_user.administrator? || current_user.moderator?
- flash[:error] = t("application.require_moderator_or_admin.not_a_moderator_or_admin")
- redirect_to root_path
- end
- end
end