]> git.openstreetmap.org Git - rails.git/blobdiff - app/controllers/issues_controller.rb
Merge remote-tracking branch 'upstream/pull/3695'
[rails.git] / app / controllers / issues_controller.rb
index 61f466f626a0ef94e27fc908e0b670d0f6aaac82..5940389397ca76e8b7b6d9a524a76d9df41185c0 100644 (file)
@@ -47,9 +47,10 @@ class IssuesController < ApplicationController
     @new_comment = IssueComment.new(:issue => @issue)
   end
 
     @new_comment = IssueComment.new(:issue => @issue)
   end
 
-  # Status Transistions
+  # Status Transitions
   def resolve
     if @issue.resolve
   def resolve
     if @issue.resolve
+      @issue.updated_by = current_user.id
       @issue.save!
       redirect_to @issue, :notice => t(".resolved")
     else
       @issue.save!
       redirect_to @issue, :notice => t(".resolved")
     else
@@ -80,6 +81,8 @@ class IssuesController < ApplicationController
   private
 
   def find_issue
   private
 
   def find_issue
-    @issue = Issue.find(params[:id])
+    @issue = Issue.visible_to(current_user).find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    redirect_to :controller => "errors", :action => "not_found"
   end
 end
   end
 end