helper_method :sort_column, :sort_direction
def index
- if @user.moderator?
+ if current_user.moderator?
@issue_types = @moderator_issues
@users = User.joins(:roles).where(:user_roles => { :role => "moderator" })
else
@issues = Issue.where(:issue_type => @user_role).order(sort_column + " " + sort_direction)
# If search
- if params[:search_by_user] && !params[:search_by_user].blank?
- @find_user = User.find_by_display_name(params[:search_by_user])
+ if params[:search_by_user] && 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
end
end
- if params[:status] && !params[:status][0].blank?
+ if params[:status] && params[:status][0].present?
@issues = @issues.where(:status => params[:status][0].to_i)
end
- if params[:issue_type] && !params[:issue_type][0].blank?
+ if params[:issue_type] && params[:issue_type][0].present?
@issues = @issues.where(:reportable_type => params[:issue_type][0])
end
# If last_updated_by
- if params[:last_updated_by] && !params[:last_updated_by][0].blank?
+ 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
@issues = @issues.where(:updated_by => last_updated_by)
end
notice = t("issues.index.search.issues_not_found") if @issues.first.nil?
- if params[:last_reported_by] && !params[:last_reported_by][0].blank?
+ if params[:last_reported_by] && params[:last_reported_by][0].present?
last_reported_by = params[:last_reported_by][0].to_s == "nil" ? nil : params[:last_reported_by][0].to_i
@issues = @issues.where(:updated_by => last_reported_by)
end
@read_reports = @issue.read_reports
@unread_reports = @issue.unread_reports
@comments = @issue.comments
- @related_issues = @issue.user.issues.where(:issue_type => @user_role)
-
- @updated_by_admin = User.find(@issue.updated_by) if @issue.updated_by
+ @related_issues = @issue.reported_user.issues.where(:issue_type => @user_role)
end
def new
- unless create_new_issue_params.blank?
+ if create_new_issue_params.present?
@issue = Issue.find_or_initialize_by(create_new_issue_params)
path = "issues.report_strings." + @issue.reportable.class.name.to_s
@report_strings_yaml = t(path)
end
def create
- @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id], params[:reportable_type])
+ @issue = Issue.find_by(:reportable_id => params[:reportable_id], :reportable_type => params[:reportable_type])
# Check if Issue already exists
unless @issue
@issue = Issue.find_or_initialize_by(issue_params)
if check_report_params
@report = @issue.reports.build(report_params)
details = report_details
- @report.reporter_user_id = @user.id
+ @report.reporter_user_id = current_user.id
@report.details = details
# Checking if instance has been updated since last report
@last_report = @issue.reports.order(:updated_at => :desc).last
Notifier.new_issue_notification(@issue.id, User.find(user.user_id)).deliver_now
end
- redirect_back "/", :notice => t("issues.create.successful_report")
+ redirect_back :fallback_location => "/", :notice => t("issues.create.successful_report")
end
else
- redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_id, :reported_user_id => @issue.reported_user_id), :notice => t("issues.create.provide_details")
+ redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_id), :notice => t("issues.create.provide_details")
end
end
@issue = Issue.find_by(issue_params)
# Check if details provided are sufficient
if check_report_params
- @report = @issue.reports.where(:reporter_user_id => @user.id).first
+ @report = @issue.reports.where(:reporter_user_id => current_user.id).first
if @report.nil?
@report = @issue.reports.build(report_params)
- @report.reporter_user_id = @user.id
+ @report.reporter_user_id = current_user.id
notice = t("issues.update.new_report")
end
if @report.save!
@issue.report_count = @issue.reports.count
@issue.save!
- redirect_back "/", :notice => notice
+ redirect_back :fallback_location => "/", :notice => notice
end
else
- redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_id, :reported_user_id => @issue.reported_user_id), :notice => t("issues.update.provide_details")
+ redirect_to new_issue_path(:reportable_type => @issue.reportable_type, :reportable_id => @issue.reportable_id), :notice => t("issues.update.provide_details")
end
end
notice = t("issues.comment.provide_details")
else
@issue_comment = @issue.comments.build(issue_comment_params)
- @issue_comment.commenter_user_id = @user.id
+ @issue_comment.commenter_user_id = current_user.id
if params[:reassign]
reassign_issue
@issue_comment.reassign = true
end
@issue_comment.save!
- @issue.updated_by = @user.id
+ @issue.updated_by = current_user.id
@issue.save!
notice = t("issues.comment.comment_created")
end
def ignore
if @issue.ignore
- @issue.updated_by = @user.id
+ @issue.updated_by = current_user.id
@issue.save!
redirect_to @issue, :notice => t("issues.ignored")
else
def reopen
if @issue.reopen
- @issue.updated_by = @user.id
+ @issue.updated_by = current_user.id
@issue.save!
redirect_to @issue, :notice => t("issues.reopened")
else
end
def set_issues
- @admin_issues = %w(DiaryEntry DiaryComment User)
- @moderator_issues = %w(Changeset Note)
+ @admin_issues = %w[DiaryEntry DiaryComment User]
+ @moderator_issues = %w[Changeset Note]
end
def setup_user_role
# Get user role
- @user_role = @user.administrator? ? "administrator" : "moderator"
+ @user_role = current_user.administrator? ? "administrator" : "moderator"
end
def check_if_updated
if @issue.reportable && (@issue.ignored? || @issue.resolved?) && @issue.reportable.has_attribute?(:updated_by) && @issue.reportable.updated_at > @last_report.updated_at
- return true
+ true
else
- return false
+ false
end
end
end
def check_permission
- unless @user.administrator? || @user.moderator?
+ unless current_user.administrator? || current_user.moderator?
flash[:error] = t("application.require_admin.not_an_admin")
redirect_to root_path
end
end
def create_new_issue_params
- params.permit(:reportable_id, :reportable_type, :reported_user_id)
+ params.permit(:reportable_id, :reportable_type)
end
def issue_params
- params[:issue].permit(:reportable_id, :reportable_type, :reported_user_id)
+ params[:issue].permit(:reportable_id, :reportable_type)
end
def report_params
end
def sort_direction
- %w(asc desc).include?(params[:direction]) ? params[:direction] : "asc"
- end
-
- # back-port of ActionController#redirect_back from rails 5
- def redirect_back(fallback_location, **args)
- if referer = request.headers["Referer"]
- redirect_to referer, **args
- else
- redirect_to fallback_location, **args
- end
+ %w[asc desc].include?(params[:direction]) ? params[:direction] : "asc"
end
end
projects / rails.git / blobdiff