Merge branch 'master' into moderation

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 7f455b9e9290529f6eaeaf972d0288032465c234..90fd0306dc2d7523326554e430775046b779e471 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -31,7 +31,7 @@ class IssuesController < ApplicationController
     end
 
     if params[:status] && params[:status][0].present?
-      @issues = @issues.where(:status => params[:status][0].to_i)
+      @issues = @issues.where(:status => params[:status][0])
     end
 
     if params[:issue_type] && params[:issue_type][0].present?
@@ -50,7 +50,7 @@ class IssuesController < ApplicationController
     @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
 
@@ -88,7 +88,7 @@ class IssuesController < ApplicationController
 
   def set_issues
     @admin_issues = %w[DiaryEntry DiaryComment User]
-    @moderator_issues = %w[Changeset Note]
+    @moderator_issues = %w[Note]
   end
 
   def check_if_updated