before_action :find_issue, only: [:show, :resolve, :reopen, :ignore]
def index
- if params[:search_by_user].present?
- @user = User.find_by_display_name(params[:search_by_user])
- if @user.present?
- @issues = Issue.where(reported_user_id: @user.id).order(:status)
+ # Get user role
+ if @user.administrator?
+ @user_role = "administrator"
+ else
+ @user_role = "moderator"
+ end
+
+ # If search
+ if params[:search_by_user]
+ @find_user = User.find_by_display_name(params[:search_by_user])
+ if @find_user
+ @issues = Issue.where(reported_user_id: @find_user.id, issue_type: @user_role).order(:status)
else
- @issues = Issue.all.order(:status)
- redirect_to issues_path, notice: t('issues.index.search.user_not_found')
+ @issues = Issue.where(issue_type: @user_role).order(:status)
+ notice = t('issues.index.search.user_not_found')
end
-
- if @user.present? and not @issues.present?
- @issues = Issue.all.order(:status)
- redirect_to issues_path, notice: t('issues.index.search.issues_not_found')
+
+ if @find_user !=nil and @issues.first == nil
+ @issues = Issue.where(issue_type: @user_role).order(:status)
+ notice = t('issues.index.search.issues_not_found')
end
+
+ if notice
+ redirect_to issues_path, notice: notice
+ end
+
else
- @issues = Issue.all.order(:status)
+ @issues = Issue.where(issue_type: @user_role).order(:status)
end
end
@unread_reports = @issue.unread_reports
@comments = @issue.comments
@related_issues = @issue.user.issues
+ if @issue.updated_by
+ @updated_by_admin = User.find(@issue.updated_by)
+ end
end
def new
unless create_new_issue_params.blank?
@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
end
def create
- @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type])
+ # TODO: Find better place to add these
+ admin_issues = [ 'DiaryEntry', 'DiaryComment', 'User']
+ moderator_issues = [ 'Changeset' ]
+
+
+ @issue = Issue.find_by_reportable_id_and_reportable_type(params[:reportable_id],params[:reportable_type])
# Check if Issue alrwady exists
if !@issue
@issue = Issue.find_or_initialize_by(issue_params)
- @admins = UserRole.where(role: "administrator")
- @admins.each do |admin|
- Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now
+ @issue.updated_by = nil
+
+ # Reassign to moderators if it is a moderator issue
+ @issue.issue_type = "administrator"
+ if moderator_issues.include? @issue.reportable.class.name
+ reassign_issue
+ end
+
+ @admins_or_mods = UserRole.where(role: @issue.issue_type)
+ @admins_or_mods.each do |user|
+ Notifier.new_issue_notification(User.find(user.user_id)).deliver_now
end
+
end
# Check if details provided are sufficient
- if params[:report][:details] and (params[:spam] or params[:offensive] or params[:threat] or params[:vandal] or params[:other])
+ if check_report_params
@report = @issue.reports.build(report_params)
- details = params[:report][:details].to_s + "||" + params[:spam].to_s + "||" + params[:offensive].to_s + "||" + params[:threat].to_s + "||" + params[:vandal].to_s + "||" + params[:other].to_s
+ details = get_report_details
@report.reporter_user_id = @user.id
@report.details = details
# Checking if instance has been updated since last report
@last_report = @issue.reports.order(updated_at: :desc).last
- if @issue.reportable.updated_at.present? and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at
+ if check_if_updated
if @issue.reopen
@issue.save!
end
def update
@issue = Issue.find_by(issue_params)
-
# Check if details provided are sufficient
- if params[:report][:details] and (params[:spam] or params[:offensive] or params[:threat] or params[:vandal] or params[:other])
+ if check_report_params
@report = @issue.reports.where(reporter_user_id: @user.id).first
if @report == nil
notice = t('issues.update.new_report')
end
- details = params[:report][:details].to_s + "||" + params[:spam].to_s + "||" + params[:offensive].to_s + "||" + params[:threat].to_s + "||" + params[:vandal].to_s + "||" + params[:other].to_s
+ details = get_report_details
@report.details = details
# Checking if instance has been updated since last report
@last_report = @issue.reports.order(updated_at: :desc).last
- if @issue.reportable.updated_at.present? and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at
+ if check_if_updated
@issue.reopen
@issue.save!
end
def comment
@issue = Issue.find(params[:id])
- @issue_comment = @issue.comments.build(issue_comment_params)
- @issue_comment.commenter_user_id = @user.id
- @issue_comment.save!
- redirect_to @issue
+ if issue_comment_params.blank?
+ notice = t('issues.comment.provide_details')
+ else
+ @issue_comment = @issue.comments.build(issue_comment_params)
+ @issue_comment.commenter_user_id = @user.id
+ if params[:reassign]
+ reassign_issue
+ @issue_comment.reassign = true
+ end
+ @issue_comment.save!
+ @issue.updated_by = @user.id
+ @issue.save!
+ notice = t('issues.comment.comment_created')
+ end
+ redirect_to @issue, notice: notice
end
# Status Transistions
def ignore
if @issue.ignore
+ @issue.updated_by = @user.id
@issue.save!
redirect_to @issue, notice: t('issues.ignored')
else
def reopen
if @issue.reopen
+ @issue.updated_by = @user.id
@issue.save!
redirect_to @issue, notice: t('issues.reopened')
else
end
end
+ # Reassign Issues between Administrators and Moderators
+ def reassign_issue
+ if @issue.issue_type == "moderator"
+ @issue.issue_type = "administrator"
+ else
+ @issue.issue_type = "moderator"
+ end
+ @issue.save!
+ end
+
private
+ def check_if_updated
+ if @issue.reportable and (@issue.ignored? or @issue.resolved?) and @issue.reportable.updated_at > @last_report.updated_at
+ return true
+ else
+ return false
+ end
+ end
+
+ def get_report_details
+ details = params[:report][:details] + "--||--"
+ details = details + params[:report_type].to_s + "--||--"
+ return details
+ end
+
+ def check_report_params
+ if params[:report] and params[:report][:details] and params[:report_type]
+ return true
+ end
+ return false
+ end
+
def find_issue
@issue = Issue.find(params[:id])
end
def check_permission
- unless @user.administrator?
- flash[:error] = t("application.require_admin.not_an_admin")
+ unless @user.administrator? or @user.moderator?
+ flash[:error] = t('application.require_admin.not_an_admin')
redirect_to root_path
end
end
def issue_comment_params
params.require(:issue_comment).permit(:body)
end
+
end
projects / rails.git / blobdiff