Merge remote-tracking branch 'upstream/pull/4367'

[rails.git] / app / controllers / issues_controller.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 7f455b9e9290529f6eaeaf972d0288032465c234..c24054f77ff3adf4ab44073cea134c9748403b51 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -2,63 +2,60 @@ class IssuesController < ApplicationController
   layout "site"
 
   before_action :authorize_web
-  before_action :require_user
-  before_action :set_issues
-  before_action :check_permission
+  before_action :set_locale
+  before_action :check_database_readable
+
+  authorize_resource
+
   before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore]
+  before_action :check_database_writable, :only => [:resolve, :ignore, :reopen]
 
   def index
     @title = t ".title"
 
-    if current_user.moderator?
-      @issue_types = @moderator_issues
-      @users = User.joins(:roles).where(:user_roles => { :role => "moderator" })
-    else
-      @issue_types = @admin_issues
-      @users = User.joins(:roles).where(:user_roles => { :role => "administrator" })
-    end
+    @issue_types = []
+    @issue_types.push("Note", "User") if current_user.moderator?
+    @issue_types.push("DiaryEntry", "DiaryComment", "User") if current_user.administrator?
 
-    @issues = Issue.where(:assigned_role => current_user.roles.map(&:role))
+    @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct
+    @issues = Issue.visible_to(current_user).order(:updated_at => :desc)
 
     # If search
-    if params[:search_by_user] && params[:search_by_user].present?
+    if 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)
+        @issues = @issues.where(:reported_user => @find_user)
       else
-        notice = t("issues.index.user_not_found")
+        @issues = @issues.none
+        flash.now[:warning] = t(".user_not_found")
       end
     end
 
-    if params[:status] && params[:status][0].present?
-      @issues = @issues.where(:status => params[:status][0].to_i)
-    end
+    @issues = @issues.where(:status => params[:status]) if params[:status].present?
 
-    if params[:issue_type] && params[:issue_type][0].present?
-      @issues = @issues.where(:reportable_type => params[:issue_type][0])
-    end
+    @issues = @issues.where(:reportable_type => params[:issue_type]) if params[:issue_type].present?
 
-    if params[:last_updated_by] && params[:last_updated_by][0].present?
-      last_updated_by = params[:last_updated_by][0].to_s == "nil" ? nil : params[:last_updated_by][0].to_i
+    if 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
-
-    redirect_to issues_path, :notice => notice if notice
   end
 
   def show
+    @title = t ".title", :status => @issue.status.humanize, :issue_id => @issue.id
     @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))
+    @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
+  # Status Transitions
   def resolve
     if @issue.resolve
+      @issue.updated_by = current_user.id
       @issue.save!
-      redirect_to @issue, :notice => t("issues.resolved")
+      redirect_to @issue, :notice => t(".resolved")
     else
       render :show
     end
@@ -68,7 +65,7 @@ class IssuesController < ApplicationController
     if @issue.ignore
       @issue.updated_by = current_user.id
       @issue.save!
-      redirect_to @issue, :notice => t("issues.ignored")
+      redirect_to @issue, :notice => t(".ignored")
     else
       render :show
     end
@@ -78,7 +75,7 @@ class IssuesController < ApplicationController
     if @issue.reopen
       @issue.updated_by = current_user.id
       @issue.save!
-      redirect_to @issue, :notice => t("issues.reopened")
+      redirect_to @issue, :notice => t(".reopened")
     else
       render :show
     end
@@ -86,47 +83,9 @@ class IssuesController < ApplicationController
 
   private
 
-  def set_issues
-    @admin_issues = %w[DiaryEntry DiaryComment User]
-    @moderator_issues = %w[Changeset Note]
-  end
-
-  def check_if_updated
-    if @issue.reportable && (@issue.ignored? || @issue.resolved?) && @issue.reportable.has_attribute?(:updated_by) && @issue.reportable.updated_at > @last_report.updated_at
-      true
-    else
-      false
-    end
-  end
-
   def find_issue
-    @issue = Issue.find(params[:id])
-  end
-
-  def check_permission
-    unless current_user.administrator? || current_user.moderator?
-      flash[:error] = t("application.require_admin.not_an_admin")
-      redirect_to root_path
-    end
-  end
-
-  def issue_params
-    params[:issue].permit(:reportable_id, :reportable_type)
-  end
-
-  def report_params
-    params[:report].permit(:details)
-  end
-
-  def issue_comment_params
-    params.require(:issue_comment).permit(:body)
-  end
-
-  def sort_column
-    Issue.column_names.include?(params[:sort]) ? params[:sort] : "status"
-  end
-
-  def sort_direction
-    %w[asc desc].include?(params[:direction]) ? params[:direction] : "asc"
+    @issue = Issue.visible_to(current_user).find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    redirect_to :controller => "errors", :action => "not_found"
   end
 end