X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cf4cfc530ae54abee7b6a0dccbc9d4603ab35611..c7bc13668b78afde72e9b8f6644b001799e84eb9:/app/controllers/issues_controller.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index edb48e64c..4f88dce84 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -7,7 +7,7 @@ class IssuesController < ApplicationController
   before_action :find_issue, only: [:show, :resolve, :reopen, :ignore]
 
   def index
-    @issues = Issue.all
+    @issues = Issue.all.order(:status)
   end
 
   def show
@@ -25,6 +25,8 @@ class IssuesController < ApplicationController
 
   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)
       @admins = UserRole.where(role: "administrator")
@@ -32,11 +34,22 @@ class IssuesController < ApplicationController
         Notifier.new_issue_notification(User.find(admin.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])
       @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
       @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 @issue.reopen
+          @issue.save!
+        end
+      end
+
       if @issue.save!
         redirect_to root_path, notice: t('issues.create.successful_report')
       end
@@ -47,12 +60,33 @@ 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])
       @report = @issue.reports.where(reporter_user_id: @user.id).first
+      
+      if @report == nil
+        @report = @issue.reports.build(report_params)
+        @report.reporter_user_id = @user.id
+        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
       @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
+        @issue.reopen
+        @issue.save!
+      end
+
+      if notice == nil
+        notice = t('issues.update.successful_update')
+      end
+
       if @report.save!
-        redirect_to root_path, notice: t('issues.update.successful_update')
+        redirect_to root_path, 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')