X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d1d4f8192da5a266cddb17bb8970b2b04387888c..0a3dd82c47f5df0d55554c80a3b47f54ef6d204b:/app/controllers/issues_controller.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index c1c5dd4f3..ed80777df 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -7,7 +7,22 @@ class IssuesController < ApplicationController
   before_action :find_issue, only: [:show, :resolve, :reopen, :ignore]
 
   def index
-    @issues = Issue.all
+    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)
+      else 
+        @issues = Issue.all.order(:status)
+        redirect_to issues_path, 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')
+      end
+    else
+      @issues = Issue.all.order(:status)
+    end
   end
 
   def show
@@ -25,6 +40,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,19 +49,69 @@ class IssuesController < ApplicationController
         Notifier.new_issue_notification(User.find(admin.user_id)).deliver_now
       end
     end
-    @report = @issue.reports.build(report_params)
-    @report.user_id = @user.id
-    if @issue.save!
-      redirect_to root_path, notice: 'Your report has been registered sucessfully.'
+
+    # 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
     else
-      render :new
+      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.create.provide_details')
     end
   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])
+      @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: 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')
+    end  
+  end
+
   def comment
     @issue = Issue.find(params[:id])
     @issue_comment = @issue.comments.build(issue_comment_params)
-    @issue_comment.user_id = @user.id
+    @issue_comment.commenter_user_id = @user.id
     @issue_comment.save!
     redirect_to @issue
   end
@@ -53,7 +120,7 @@ class IssuesController < ApplicationController
   def resolve
     if @issue.resolve
       @issue.save!
-      redirect_to @issue, notice: "Issue status has been set to: 'Resolved'"
+      redirect_to @issue, notice: t('issues.resolved')
     else
       render :show
     end
@@ -62,7 +129,7 @@ class IssuesController < ApplicationController
   def ignore
     if @issue.ignore
       @issue.save!
-      redirect_to @issue, notice: "Issue status has been set to: 'Ignored'"
+      redirect_to @issue, notice: t('issues.ignored')
     else
       render :show
     end
@@ -71,7 +138,7 @@ class IssuesController < ApplicationController
   def reopen
     if @issue.reopen
       @issue.save!
-      redirect_to @issue, notice: "Issue status has been set to: 'Open'"
+      redirect_to @issue, notice: t('issues.reopened')
     else
       render :show
     end
@@ -103,6 +170,6 @@ class IssuesController < ApplicationController
     end
 
     def issue_comment_params
-      params.require(:issue_comment).permit(:body, :user_id)
+      params.require(:issue_comment).permit(:body)
     end
 end