cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Proper implementation of report strings + cleaning up

Browse source
This commit is contained in:
Shrey 2015-06-11 16:05:26 +05:30 • committed by Matt Amos
parent 0a3dd82c47
commit fb78544d05
5 changed files with 135 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

53
app/controllers/issues_controller.rb
View file

@ -35,12 +35,13 @@ class IssuesController < ApplicationController
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])
# Check if Issue alrwady exists
if !@issue
@issue = Issue.find_or_initialize_by(issue_params)
@ -51,15 +52,15 @@ class IssuesController < ApplicationController
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
@ -75,9 +76,8 @@ class IssuesController < ApplicationController
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
@ -86,12 +86,12 @@ class IssuesController < ApplicationController
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
@ -144,15 +144,49 @@ class IssuesController < ApplicationController
end
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] + "--||--"
path = 'issues.report_strings.' + @issue.reportable.class.name.to_s
@report_strings_yaml = t( path)
@report_strings_yaml.each do |k,v|
if params[k.to_sym]
details = details + params[k.to_sym] + "--||--"
end
end
return details
end
def check_report_params
path = 'issues.report_strings.' + @issue.reportable.class.name.to_s
@report_strings_yaml = t( path)
if params[:report] and params[:report][:details]
@report_strings_yaml.each do |k,v|
if params[k.to_sym]
return true
end
end
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")
flash[:error] = t('application.require_admin.not_an_admin')
redirect_to root_path
end
end
@ -172,4 +206,5 @@ class IssuesController < ApplicationController
def issue_comment_params
params.require(:issue_comment).permit(:body)
end
end

2
app/views/issues/_reports.html.erb
View file

@ -4,7 +4,7 @@
<%= link_to user_thumbnail(report.user), :controller => :user,:action =>:view, :display_name => report.user.display_name %>
</div>
<b><%= link_to report.user.display_name, :controller => :user,:action =>:view, :display_name => report.user.display_name %></b> <br/>
<% details = report.details.split("||") %>
<% details = report.details.split("--||--") %>
<%= details[0] %>
<br/>
<br/>

52
app/views/issues/new.html.erb
View file

@ -1,5 +1,5 @@
<% content_for :heading do %>
<h1>Report a new Issue for <%= reportable_url(@issue.reportable) %></h1>
<h1>Report <%= reportable_url(@issue.reportable) %></h1>
<% end %>
<%= form_for(@issue) do |f| %>
@ -13,59 +13,19 @@
<div class='form-row'>
<p>Select one (or more) reasons for your report:</p>
<div class="new-report-form">
<div class="new-report-checkbox">
<%= check_box_tag :spam, "[SPAM]" %>
</div>
<div class="new-report-string">
<%= label_tag "This #{@issue.reportable.class.name} " + t('issues.report_strings.spam') %> <br/>
</div>
</div>
<br/>
<div class="new-report-form">
<div class="new-report-checkbox">
<%= check_box_tag :offensive, "[OFFENSIVE]" %>
</div>
<div class="new-report-string">
<%= label_tag "This #{@issue.reportable.class.name} " + t('issues.report_strings.offensive') %> <br/>
</div>
</div>
<br/>
<div class="new-report-form">
<div class="new-report-checkbox">
<%= check_box_tag :threat, "[THREAT]" %>
</div>
<div class="new-report-string">
<%= label_tag "This #{@issue.reportable.class.name} " + t('issues.report_strings.threat') %> <br/>
</div>
</div>
<br/>
<% if @issue.reportable.class.name == "User" %>
<% @report_strings_yaml.each do |k,v| %>
<div class="new-report-form">
<div class="new-report-checkbox">
<%= check_box_tag :vandal, "[VANDAL]" %>
<%= check_box_tag k.to_sym, v[:type].to_s %>
</div>
<div class="new-report-string">
<%= label_tag "This #{@issue.reportable.class.name} " + t('issues.report_strings.vandal') %> <br/>
<%= label_tag v[:details].to_s %> <br/>
</div>
</div>
<br/>
<% end %>
<div class="new-report-form">
<div class="new-report-checkbox">
<%= check_box_tag :other, "[OTHER]" %>
</div>
<div class="new-report-string">
<%= label_tag t('issues.report_strings.other') %> <br/>
</div>
</div>
<br/>
<% end %>
<label class="standard-label"><b><%= t 'issue.new.message' -%>: </b></label> <br/>
<%= text_area :report, :details, :cols => 80, :rows => 20, placeholder: t('issues.new.details'), required: true %>
</div>

47
config/locales/en-GB.yml
View file

@ -957,11 +957,48 @@ en-GB:
ignored: Issue status has been set to 'Ignored'
reopened: Issue status has been set to 'Open'
report_strings:
spam: is/contains spam
offensive: is obscene/offensive
threat: contains a threat
vandal: is a vandal
other: Other
DiaryEntry:
spam:
type: "[SPAM]"
details: This Diary Entry is/contains spam
offensive:
type: "[OFFENSIVE]"
details: This Diary Entry is obscene/offensive
threat:
type: "[THREAT]"
details: This Diary Entry contains a threat
other:
type: "[OTHER]"
details: Other
DiaryComment:
spam:
type: "[SPAM]"
details: This Diary Comment is/contains spam
offensive:
type: "[OFFENSIVE]"
details: This Diary Comment is obscene/offensive
threat:
type: "[THREAT]"
details: This Diary Comment contains a threat
other:
type: "[OTHER]"
details: Other
User:
spam:
type: "[SPAM]"
details: This User profile is/contains spam
offensive:
type: "[OFFENSIVE]"
details: This User profile is obscene/offensive
threat:
type: "[THREAT]"
details: This User profile contains a threat
vandal:
type: "[VANDAL]"
details: This User is a vandal
other:
type: "[OTHER]"
details: Other
layouts:
project_name:
title: OpenStreetMap

47
config/locales/en.yml
View file

@ -927,11 +927,48 @@ en:
ignored: Issue status has been set to 'Ignored'
reopened: Issue status has been set to 'Open'
report_strings:
spam: is/contains spam
offensive: is obscene/offensive
threat: contains a threat
vandal: is a vandal
other: Other
DiaryEntry:
spam:
type: "[SPAM]"
details: This Diary Entry is/contains spam
offensive:
type: "[OFFENSIVE]"
details: This Diary Entry is obscene/offensive
threat:
type: "[THREAT]"
details: This Diary Entry contains a threat
other:
type: "[OTHER]"
details: Other
DiaryComment:
spam:
type: "[SPAM]"
details: This Diary Comment is/contains spam
offensive:
type: "[OFFENSIVE]"
details: This Diary Comment is obscene/offensive
threat:
type: "[THREAT]"
details: This Diary Comment contains a threat
other:
type: "[OTHER]"
details: Other
User:
spam:
type: "[SPAM]"
details: This User profile is/contains spam
offensive:
type: "[OFFENSIVE]"
details: This User profile is obscene/offensive
threat:
type: "[THREAT]"
details: This User profile contains a threat
vandal:
type: "[VANDAL]"
details: This User is a vandal
other:
type: "[OTHER]"
details: Other
layouts:
project_name:
# in <title>