From 5d0f8853b54f6e950aca91374057229ea14d0f40 Mon Sep 17 00:00:00 2001
From: Oleksandr Shulgin <oleksandr.shulgin@zalando.de>
Date: Wed, 14 Oct 2015 11:40:39 +0200
Subject: [PATCH] Redmine 3.0 compatibility

---
 app/controllers/canned_responses_controller.rb       | 12 ++++++++----
 app/models/canned_response.rb                        |  4 ++--
 .../hooks/_canned_responses_issue_insert.html.erb    |  5 +++--
 init.rb                                              |  5 ++---
 lib/redmine_canned_responses/project_patch.rb        |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/controllers/canned_responses_controller.rb b/app/controllers/canned_responses_controller.rb
index d2089d1..282c3f7 100644
--- a/app/controllers/canned_responses_controller.rb
+++ b/app/controllers/canned_responses_controller.rb
@@ -3,7 +3,7 @@ class CannedResponsesController < ApplicationController
 
   before_filter :find_project
 
-  before_filter [:require_admin_if_global, :authorize], :except => :insert
+  before_filter :require_admin_if_global, :except => :insert
   before_filter :authorize_unless_global, :only => :insert
 
   layout :select_layout
@@ -23,7 +23,7 @@ def edit
 
   def create
     @canned_response = @canned_responses.new
-    if @canned_response.update_attributes(params[:canned_response])
+    if @canned_response.update_attributes(cr_params)
       flash[:notice] = l(:notice_canned_response_created)
       redirect_to @canned_response
     else
@@ -32,7 +32,7 @@ def create
   end
 
   def update
-    if @canned_response.update_attributes(params[:canned_response])
+    if @canned_response.update_attributes(cr_params)
       flash[:notice] = l(:notice_canned_response_updated)
       redirect_to @canned_response
     else
@@ -48,7 +48,7 @@ def destroy
   end
 
   def preview
-    @text = params[:canned_response][:text]
+    @text = cr_params[:text]
     render :partial => 'common/preview'
   end
 
@@ -58,6 +58,10 @@ def insert
 
   private
 
+  def cr_params
+    params.require(:canned_response).permit(:title, :text)
+  end
+
   include CannedResponsesHelper
 
   def select_layout
diff --git a/app/models/canned_response.rb b/app/models/canned_response.rb
index 5b5182a..a88995a 100644
--- a/app/models/canned_response.rb
+++ b/app/models/canned_response.rb
@@ -3,8 +3,8 @@ class CannedResponse < ActiveRecord::Base
 
   validates_presence_of :title, :text
 
-  scope :global, where(:project_id => nil)
-  default_scope order(:title)
+  scope :global, lambda { where(:project_id => nil) }
+  default_scope { order(:title) }
 
   def global?
     project.nil?
diff --git a/app/views/hooks/_canned_responses_issue_insert.html.erb b/app/views/hooks/_canned_responses_issue_insert.html.erb
index 84ecf9a..a882545 100644
--- a/app/views/hooks/_canned_responses_issue_insert.html.erb
+++ b/app/views/hooks/_canned_responses_issue_insert.html.erb
@@ -5,8 +5,9 @@
     <% url = url_for(:controller => 'canned_responses', :action => 'insert',
                      :project_id => nil, :id => ':id') %>
     <% js = <<EOF
-if ($('#canned_response').attr('value'))
-  $.ajax({ url: '#{url}'.replace(':id', $('#canned_response').attr('value')), type: 'get',
+val = $(':selected', '#canned_response').attr('value');
+if (val)
+  $.ajax({ url: '#{url}'.replace(':id', val), type: 'get',
            success: function(data) {
              $('#issue_#{issue.new_record? ? 'description' : 'notes'}').html(data);
            }
diff --git a/init.rb b/init.rb
index b774d3c..8c95bc0 100644
--- a/init.rb
+++ b/init.rb
@@ -1,10 +1,9 @@
-require 'redmine'
-
 Redmine::Plugin.register :redmine_canned_responses do
   name 'Redmine Canned Responses plugin'
   author 'Alex Shulgin <ash@commandprompt.com>'
   description 'Store and use prepared (canned) responses, per-project or globally.'
-  version '0.2.0'
+  version '0.3.0'
+  requires_redmine '3.0.0'
   url 'http://github.com/commandprompt/redmine_canned_responses'
 #  author_url 'http://example.com/about'
 
diff --git a/lib/redmine_canned_responses/project_patch.rb b/lib/redmine_canned_responses/project_patch.rb
index 21bd5e3..8662abc 100644
--- a/lib/redmine_canned_responses/project_patch.rb
+++ b/lib/redmine_canned_responses/project_patch.rb
@@ -4,7 +4,7 @@ module ProjectPatch
 
     def self.included(base)
       base.class_eval do
-        has_many :canned_responses, lambda {order('title')}
+        has_many :canned_responses, lambda { order('title') }
       end
     end
   end