From fb78544d05fc3539e672d029b37e6e37bf9a610a Mon Sep 17 00:00:00 2001 From: Shrey Date: Thu, 11 Jun 2015 16:05:26 +0530 Subject: [PATCH 1/1] Proper implementation of report strings + cleaning up --- app/controllers/issues_controller.rb | 53 +++++++++++++++++++++++----- app/views/issues/_reports.html.erb | 2 +- app/views/issues/new.html.erb | 52 ++++----------------------- config/locales/en-GB.yml | 47 +++++++++++++++++++++--- config/locales/en.yml | 47 +++++++++++++++++++++--- 5 files changed, 135 insertions(+), 66 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index ed80777df..7cd21d512 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -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 diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb index c5dbcb9b5..94ae3ca0e 100644 --- a/app/views/issues/_reports.html.erb +++ b/app/views/issues/_reports.html.erb @@ -4,7 +4,7 @@ <%= link_to user_thumbnail(report.user), :controller => :user,:action =>:view, :display_name => report.user.display_name %> <%= link_to report.user.display_name, :controller => :user,:action =>:view, :display_name => report.user.display_name %>
- <% details = report.details.split("||") %> + <% details = report.details.split("--||--") %> <%= details[0] %>

diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb index 499035db6..8a0055e51 100644 --- a/app/views/issues/new.html.erb +++ b/app/views/issues/new.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

Report a new Issue for <%= reportable_url(@issue.reportable) %>

+

Report <%= reportable_url(@issue.reportable) %>

<% end %> <%= form_for(@issue) do |f| %> @@ -13,59 +13,19 @@

Select one (or more) reasons for your report:

- -
-
- <%= check_box_tag :spam, "[SPAM]" %> -
-
- <%= label_tag "This #{@issue.reportable.class.name} " + t('issues.report_strings.spam') %>
-
-
-
- -
-
- <%= check_box_tag :offensive, "[OFFENSIVE]" %> -
-
- <%= label_tag "This #{@issue.reportable.class.name} " + t('issues.report_strings.offensive') %>
-
-
-
- -
-
- <%= check_box_tag :threat, "[THREAT]" %> -
-
- <%= label_tag "This #{@issue.reportable.class.name} " + t('issues.report_strings.threat') %>
-
-
-
- <% if @issue.reportable.class.name == "User" %> + <% @report_strings_yaml.each do |k,v| %>
- <%= check_box_tag :vandal, "[VANDAL]" %> + <%= check_box_tag k.to_sym, v[:type].to_s %>
- <%= label_tag "This #{@issue.reportable.class.name} " + t('issues.report_strings.vandal') %>
+ <%= label_tag v[:details].to_s %>

- <% end %> - -
-
- <%= check_box_tag :other, "[OTHER]" %> -
-
- <%= label_tag t('issues.report_strings.other') %>
-
-
-
- + <% end %> +
<%= text_area :report, :details, :cols => 80, :rows => 20, placeholder: t('issues.new.details'), required: true %>
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 663e78cd4..5962eb747 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -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 diff --git a/config/locales/en.yml b/config/locales/en.yml index 3e898b008..46de256bf 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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 -- 2.43.2