Simplify margins when showing diary entries

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

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index ad38454f0650ba62ebd2dae40c1ab383c462c12a..5940389397ca76e8b7b6d9a524a76d9df41185c0 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -3,8 +3,9 @@ class IssuesController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
 
   before_action :authorize_web
   before_action :set_locale

-  before_action :require_user
-  before_action :check_permission
+
+  authorize_resource
+

   before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore]
 
   def index
   before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore]
 
   def index


@@ -46,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


@@ -79,13 +81,8 @@ class IssuesController < ApplicationController
   private
 
   def find_issue
   private
 
   def find_issue

-    @issue = Issue.find(params[:id])
-  end
-
-  def check_permission
-    unless current_user.administrator? || current_user.moderator?
-      flash[:error] = t("application.require_moderator_or_admin.not_a_moderator_or_admin")
-      redirect_to root_path
-    end
+    @issue = Issue.visible_to(current_user).find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    redirect_to :controller => "errors", :action => "not_found"

   end
 end
   end
 end