From: Tom Hughes Date: Sun, 10 Jun 2018 16:02:12 +0000 (+0100) Subject: Merge branch 'master' into next X-Git-Tag: live~2953^2~6 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d3700e6201b4b78a70bbb2941572edc985b63c2c?hp=e4b94f4e5ef195dd5743ab3a510caecb7525a3b7 Merge branch 'master' into next --- diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 362cfcb32..da801d681 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -67,7 +67,7 @@ Metrics/AbcSize: # Offense count: 41 # Configuration parameters: CountComments, ExcludedMethods. Metrics/BlockLength: - Max: 247 + Max: 257 # Offense count: 12 # Configuration parameters: CountBlocks. diff --git a/Gemfile b/Gemfile index 7d59cceb1..ef14d06c5 100644 --- a/Gemfile +++ b/Gemfile @@ -70,6 +70,9 @@ gem "omniauth-windowslive" # Markdown formatting support gem "redcarpet" +# For status transitions of Issues +gem "aasm" + # Load libxml support for XML parsing and generation gem "libxml-ruby", ">= 2.0.5", :require => "libxml" diff --git a/Gemfile.lock b/Gemfile.lock index 8634f8df8..49f9b5977 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,6 +2,7 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) + aasm (4.1.0) actioncable (5.1.5) actionpack (= 5.1.5) nio4r (~> 2.0) @@ -360,6 +361,7 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) + aasm actionpack-page_caching annotate autoprefixer-rails diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index cef2efbb2..f9214b24d 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -2820,3 +2820,59 @@ input.richtext_title[type="text"] { display: none; } } + +.read-reports { + background: #eee; + opacity: 0.7; +} + +.report-related-block { + display:inline-block; +} + +.report-block { + width:475px; + float:left; + margin-right:100px; +} + +.related-reports { + width: 280px; + float: right; + + ul { + padding-left: $lineheight; + margin-bottom: 0; + + li { + list-style: disc; + } + } +} + +.issue-comments { + width:475px; +} + +.issues-list { + td:nth-child(2) { + white-space: nowrap; + } +} + +.report-disclaimer { + background: #fff1f0; + color: #d85030; + border-color: rgba(216, 80, 48, 0.3); + padding: 10px 20px; + margin-bottom: $lineheight; + + ul { + padding-left: $lineheight; + margin-bottom: 0; + + li { + list-style: disc; + } + } +} diff --git a/app/controllers/issue_comments_controller.rb b/app/controllers/issue_comments_controller.rb new file mode 100644 index 000000000..52904d5b2 --- /dev/null +++ b/app/controllers/issue_comments_controller.rb @@ -0,0 +1,37 @@ +class IssueCommentsController < ApplicationController + layout "site" + + before_action :authorize_web + before_action :require_user + before_action :check_permission + + def create + @issue = Issue.find(params[:issue_id]) + comment = @issue.comments.build(issue_comment_params) + comment.user = current_user + comment.save! + notice = t(".comment_created") + reassign_issue(@issue) if params[:reassign] + redirect_to @issue, :notice => notice + end + + private + + def issue_comment_params + params.require(:issue_comment).permit(:body) + 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 + + # This sort of assumes there are only two roles + def reassign_issue(issue) + role = (Issue::ASSIGNED_ROLES - [issue.assigned_role]).first + issue.assigned_role = role + issue.save! + end +end diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb new file mode 100644 index 000000000..729528946 --- /dev/null +++ b/app/controllers/issues_controller.rb @@ -0,0 +1,90 @@ +class IssuesController < ApplicationController + layout "site" + + before_action :authorize_web + before_action :require_user + before_action :check_permission + before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore] + + def index + @title = t ".title" + + @issue_types = [] + @issue_types.concat %w[Note] if current_user.moderator? + @issue_types.concat %w[DiaryEntry DiaryComment User] if current_user.administrator? + + @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct + @issues = Issue.where(:assigned_role => current_user.roles.map(&:role)) + + # If search + 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 + @issues = @issues.none + flash.now[:warning] = t(".user_not_found") + end + end + + @issues = @issues.where(:status => params[:status]) if params[:status] && params[:status].present? + + @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type] && params[:issue_type].present? + + if params[:last_updated_by] && 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 + end + + def show + @read_reports = @issue.read_reports + @unread_reports = @issue.unread_reports + @comments = @issue.comments + @related_issues = @issue.reported_user.issues.where(:assigned_role => current_user.roles.map(&:role)) if @issue.reported_user + @new_comment = IssueComment.new(:issue => @issue) + end + + # Status Transistions + def resolve + if @issue.resolve + @issue.save! + redirect_to @issue, :notice => t(".resolved") + else + render :show + end + end + + def ignore + if @issue.ignore + @issue.updated_by = current_user.id + @issue.save! + redirect_to @issue, :notice => t(".ignored") + else + render :show + end + end + + def reopen + if @issue.reopen + @issue.updated_by = current_user.id + @issue.save! + redirect_to @issue, :notice => t(".reopened") + else + render :show + end + end + + private + + 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 diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb new file mode 100644 index 000000000..95c9343e6 --- /dev/null +++ b/app/controllers/reports_controller.rb @@ -0,0 +1,42 @@ +class ReportsController < ApplicationController + layout "site" + + before_action :authorize_web + before_action :require_user + + def new + if required_new_report_params_present? + @report = Report.new + @report.issue = Issue.find_or_initialize_by(create_new_report_params) + else + redirect_to root_path, :notice => t(".missing_params") + end + end + + def create + @report = current_user.reports.new(report_params) + @report.issue = Issue.find_or_initialize_by(:reportable_id => params[:report][:issue][:reportable_id], :reportable_type => params[:report][:issue][:reportable_type]) + + if @report.save + @report.issue.save + @report.issue.reopen! unless @report.issue.open? + redirect_to helpers.reportable_url(@report.issue.reportable), :notice => t(".successful_report") + else + redirect_to new_report_path(:reportable_type => @report.issue.reportable_type, :reportable_id => @report.issue.reportable_id), :notice => t(".provide_details") + end + end + + private + + def required_new_report_params_present? + create_new_report_params["reportable_id"].present? && create_new_report_params["reportable_type"].present? + end + + def create_new_report_params + params.permit(:reportable_id, :reportable_type) + end + + def report_params + params[:report].permit(:details, :category) + end +end diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb new file mode 100644 index 000000000..3c13c6536 --- /dev/null +++ b/app/helpers/issues_helper.rb @@ -0,0 +1,27 @@ +module IssuesHelper + def reportable_url(reportable) + case reportable + when DiaryEntry + url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.user.display_name, :id => reportable.id) + when User + url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name) + when DiaryComment + url_for(:controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}") + when Note + url_for(:controller => :browse, :action => :note, :id => reportable.id) + end + end + + def reportable_title(reportable) + case reportable + when DiaryEntry + reportable.title + when User + reportable.display_name + when DiaryComment + "#{reportable.diary_entry.title}, Comment id ##{reportable.id}" + when Note + "Note ##{reportable.id}" + end + end +end diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb new file mode 100644 index 000000000..70c9adac6 --- /dev/null +++ b/app/helpers/reports_helper.rb @@ -0,0 +1,5 @@ +module ReportsHelper + def report_link(name, reportable) + link_to name, new_report_url(:reportable_id => reportable.id, :reportable_type => reportable.class.name) + end +end diff --git a/app/models/issue.rb b/app/models/issue.rb new file mode 100644 index 000000000..dd068859a --- /dev/null +++ b/app/models/issue.rb @@ -0,0 +1,104 @@ +# == Schema Information +# +# Table name: issues +# +# id :integer not null, primary key +# reportable_type :string not null +# reportable_id :integer not null +# reported_user_id :integer +# status :enum default("open"), not null +# assigned_role :enum not null +# resolved_at :datetime +# resolved_by :integer +# updated_by :integer +# reports_count :integer default(0) +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_issues_on_assigned_role (assigned_role) +# index_issues_on_reportable_type_and_reportable_id (reportable_type,reportable_id) +# index_issues_on_reported_user_id (reported_user_id) +# index_issues_on_status (status) +# index_issues_on_updated_by (updated_by) +# +# Foreign Keys +# +# issues_reported_user_id_fkey (reported_user_id => users.id) +# issues_resolved_by_fkey (resolved_by => users.id) +# issues_updated_by_fkey (updated_by => users.id) +# + +class Issue < ActiveRecord::Base + belongs_to :reportable, :polymorphic => true + belongs_to :reported_user, :class_name => "User", :foreign_key => :reported_user_id + belongs_to :user_resolved, :class_name => "User", :foreign_key => :resolved_by + belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by + + has_many :reports, :dependent => :destroy + has_many :comments, :class_name => "IssueComment", :dependent => :destroy + + validates :reportable_id, :uniqueness => { :scope => [:reportable_type] } + + ASSIGNED_ROLES = %w[administrator moderator].freeze + validates :assigned_role, :presence => true, :inclusion => ASSIGNED_ROLES + + before_validation :set_default_assigned_role + before_validation :set_reported_user + + scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) } + + def read_reports + resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil + end + + def unread_reports + resolved_at.present? ? reports.where("updated_at >= ?", resolved_at) : reports + end + + include AASM + aasm :column => :status, :no_direct_assignment => true do + state :open, :initial => true + state :ignored + state :resolved + + event :ignore do + transitions :from => :open, :to => :ignored + end + + event :resolve do + transitions :from => :open, :to => :resolved + after do + self.resolved_at = Time.now.getutc + end + end + + event :reopen do + transitions :from => :resolved, :to => :open + transitions :from => :ignored, :to => :open + end + end + + private + + def set_reported_user + self.reported_user = case reportable.class.name + when "User" + reportable + when "Note" + reportable.author + else + reportable.user + end + end + + def set_default_assigned_role + if assigned_role.blank? + self.assigned_role = case reportable + when Note then "moderator" + else "administrator" + end + end + end +end diff --git a/app/models/issue_comment.rb b/app/models/issue_comment.rb new file mode 100644 index 000000000..3a5894cb3 --- /dev/null +++ b/app/models/issue_comment.rb @@ -0,0 +1,30 @@ +# == Schema Information +# +# Table name: issue_comments +# +# id :integer not null, primary key +# issue_id :integer not null +# user_id :integer not null +# body :text not null +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_issue_comments_on_issue_id (issue_id) +# index_issue_comments_on_user_id (user_id) +# +# Foreign Keys +# +# issue_comments_issue_id_fkey (issue_id => issues.id) +# issue_comments_user_id_fkey (user_id => users.id) +# + +class IssueComment < ActiveRecord::Base + belongs_to :issue + belongs_to :user + + validates :body, :presence => true + validates :user, :presence => true + validates :issue, :presence => true +end diff --git a/app/models/report.rb b/app/models/report.rb new file mode 100644 index 000000000..63296a094 --- /dev/null +++ b/app/models/report.rb @@ -0,0 +1,42 @@ +# == Schema Information +# +# Table name: reports +# +# id :integer not null, primary key +# issue_id :integer not null +# user_id :integer not null +# details :text not null +# category :string not null +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_reports_on_issue_id (issue_id) +# index_reports_on_user_id (user_id) +# +# Foreign Keys +# +# reports_issue_id_fkey (issue_id => issues.id) +# reports_user_id_fkey (user_id => users.id) +# + +class Report < ActiveRecord::Base + belongs_to :issue, :counter_cache => true + belongs_to :user + + validates :issue, :presence => true + validates :user, :presence => true + validates :details, :presence => true + validates :category, :presence => true + + def self.categories_for(reportable) + case reportable.class.name + when "DiaryEntry" then %w[spam offensive threat other] + when "DiaryComment" then %w[spam offensive threat other] + when "User" then %w[spam offensive threat vandal other] + when "Note" then %w[spam personal abusive other] + else %w[other] + end + end +end diff --git a/app/models/user.rb b/app/models/user.rb index 036f2fdc4..aaa00169f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -75,6 +75,11 @@ class User < ActiveRecord::Base has_many :roles, :class_name => "UserRole" + has_many :issues, :class_name => "Issue", :foreign_key => :reported_user_id + has_many :issue_comments + + has_many :reports + scope :visible, -> { where(:status => %w[pending active confirmed]) } scope :active, -> { where(:status => %w[active confirmed]) } scope :identifiable, -> { where(:data_public => true) } diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 37067c311..53ea0759e 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -23,6 +23,10 @@

<%= t "javascripts.notes.show.anonymous_warning" %>

<% end -%> + <% if current_user && current_user != @note.author %> +

<%= report_link(t(".report"), @note) %>

+ <% end %> + <% if @note_comments.length > 1 %>
diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb new file mode 100644 index 000000000..4b5ae4a8f --- /dev/null +++ b/app/views/issues/_comments.html.erb @@ -0,0 +1,25 @@ +
+ <% comments.each do |comment| %> +
+
+ <%= link_to user_thumbnail(comment.user), user_path(comment.user.display_name) %> +
+ <%= link_to comment.user.display_name, user_path(comment.user.display_name) %>
+ <%= comment.body %> +
+ + <%= t(".created_at", :datetime => l(comment.created_at.to_datetime, :format => :friendly)) %> + +
+ <% end %> +
+
+
+ <%= form_for @new_comment, url: issue_comments_path(@issue) do |f| %> + <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8, :required => true %> + <%= label_tag :reassign, t('.reassign_param') %> <%= check_box_tag :reassign, true %> +
+
+ <%= submit_tag 'Submit' %> + <% end %> +
diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb new file mode 100644 index 000000000..b499288a2 --- /dev/null +++ b/app/views/issues/_reports.html.erb @@ -0,0 +1,16 @@ +<% reports.each do |report| %> +
+
+ <%= link_to user_thumbnail(report.user), user_path(report.user.display_name) %> +
+ <%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user.display_name)) %> +
+ + <%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %> + +
+ <%= report.details %> +
+
+
+<% end %> diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb new file mode 100644 index 000000000..e5e7ebc00 --- /dev/null +++ b/app/views/issues/index.html.erb @@ -0,0 +1,51 @@ +<% content_for :heading do %> +

<%= t ".title" %>

+<% end %> + +<%= form_tag(issues_path, :method => :get) do %> +

<%= t ".search_guidance" %>

+<%= select_tag :status, options_for_select(Issue.aasm.states.map(&:name).map{|state| [t(".states.#{state}"), state]}, params[:status]), :include_blank => t(".select_status"), :data => { :behavior => 'category_dropdown' } %> +<%= select_tag :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => 'category_dropdown' } %> +<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: t(".reported_user") %> +<%= select_tag :last_updated_by, options_for_select(@users.all.collect{|f| [f.display_name, f.id]} << [ t(".not_updated"), "nil"], params[:last_updated_by]), :include_blank => t(".select_last_updated_by"), :data => { :behavior => 'category_dropdown' } %> +<%= submit_tag t(".search"), :name => nil %> +<% end %> +
+ +<% if @issues.length == 0 %> +

<%= t ".issues_not_found" %>

+<% end %> + +
+ + + + + + + + + + + + + <% @issues.each do |issue| %> + + + + + + + + <% end %> + +
<%= t ".status" %><%= t ".reports" %><%= t ".reported_item" %><%= t ".reported_user" %><%= t ".last_updated" %>
<%= t ".states.#{issue.status}" %><%= link_to t(".reports_count", :count => issue.reports_count), issue %><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %><%= link_to issue.reported_user.display_name, user_path(issue.reported_user.display_name) if issue.reported_user %> + <% if issue.user_updated %> + <%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated.display_name)), + :time => distance_of_time_in_words_to_now(issue.updated_at), + :title => l(issue.updated_at) %> + <% else %> + <%= t ".last_updated_time_html", :time => distance_of_time_in_words_to_now(issue.updated_at), + :title => l(issue.updated_at) %> + <% end %> +
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb new file mode 100644 index 000000000..6612f069b --- /dev/null +++ b/app/views/issues/show.html.erb @@ -0,0 +1,62 @@ +<% content_for :heading do %> +

<%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %>

+

<%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %>

+

+ + <%= @issue.assigned_role %> + | <%= t ".reports", :count => @issue.reports.count %> + | <%= t ".report_created_at", :datetime => l(@issue.created_at.to_datetime, :format => :friendly) %> + <%= " | " + t(".last_resolved_at", :datetime => l(@issue.resolved_at.to_datetime, :format =>:friendly)) if @issue.resolved_at? %> + <%= " | " + t(".last_updated_at", :datetime => l(@issue.updated_at.to_datetime, :format => :friendly), :displayname => @issue.user_updated.display_name ) if @issue.user_updated %> + +

+

+ <%= link_to t('.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %> + <% if @issue.may_ignore? %> + | <%= link_to t('.ignore'), ignore_issue_url(@issue), :method => :post %> + <% end %> +

+

<%= link_to t('.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %>

+<% end %> + +
+ +
+

<%= t ".reports_of_this_issue" %>

+ + <% if @read_reports.present? %> +
+

<%= t ".read_reports" %>

+ <%= render 'reports', reports: @read_reports %> +
+ <% end %> + + <% if @unread_reports.any? %> +
+

<%= t ".new_reports" %>

+ <%= render 'reports', reports: @unread_reports %> +
+ <% end %> +
+
+ + <% if @issue.reported_user %> +
+

<%= t ".other_issues_against_this_user" %>

+ <% if @related_issues.count > 1 %> +
    + <% @related_issues.each do |issue| %> + <% if issue.id != @issue.id %> +
  • <%= link_to reportable_title(issue.reportable), issue %>
    • + <% end %> + <% end %> +
+ <% else %> +

<%= t ".no_other_issues" %>

+ <% end %> +
+ <% end %> +
+ +

<%= t ".comments_on_this_issue" %>

+<%= render 'comments', comments: @comments %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 8411fefdb..c9107e7a8 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -38,6 +38,9 @@