diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..ad557c5 --- /dev/null +++ b/Gemfile @@ -0,0 +1,2 @@ +gem "acts_as_list" +#gem "protected_attributes" diff --git a/app/models/issue_checklist.rb b/app/models/issue_checklist.rb index cf5ce49..2f99d45 100644 --- a/app/models/issue_checklist.rb +++ b/app/models/issue_checklist.rb @@ -4,8 +4,8 @@ class IssueChecklist < ActiveRecord::Base has_one :comment, as: :commented, dependent: :delete acts_as_list - attr_accessible :is_done, :subject - attr_protected :id + #attr_accessible :is_done, :subject +# attr_protected :id validates_presence_of :subject diff --git a/app/views/issues/_checklist.html.erb b/app/views/issues/_checklist.html.erb index 1ed515c..a231cd7 100644 --- a/app/views/issues/_checklist.html.erb +++ b/app/views/issues/_checklist.html.erb @@ -14,7 +14,7 @@ <% end %> <% content_for :header_tags do %> - <% if Redmine::VERSION::MAJOR == 3 || (Redmine::VERSION::MAJOR == 2 && Redmine::VERSION::MINOR >= 1) %> + <% if Redmine::VERSION::MAJOR >= 3 || (Redmine::VERSION::MAJOR == 2 && Redmine::VERSION::MINOR >= 1) %> <%= javascript_include_tag 'jquery.klass.js', plugin: 'redmine_issue_checklist' %> <%= javascript_include_tag 'issue_checklist.jquery.js', plugin: 'redmine_issue_checklist' %> <% else %> diff --git a/app/views/issues/_checklist_form.html.erb b/app/views/issues/_checklist_form.html.erb index ca5e542..5d1e0cd 100644 --- a/app/views/issues/_checklist_form.html.erb +++ b/app/views/issues/_checklist_form.html.erb @@ -20,7 +20,7 @@ <% content_for :header_tags do %> - <% if Redmine::VERSION::MAJOR == 3 || (Redmine::VERSION::MAJOR == 2 && Redmine::VERSION::MINOR >= 1) %> + <% if Redmine::VERSION::MAJOR >= 3 || (Redmine::VERSION::MAJOR == 2 && Redmine::VERSION::MINOR >= 1) %> <%= javascript_include_tag 'jquery.klass.js', plugin: 'redmine_issue_checklist' %> <%= javascript_include_tag 'issue_checklist.jquery.js', plugin: 'redmine_issue_checklist' %> <% else %> diff --git a/db/migrate/20111010202847_create_issue_checklists.rb b/db/migrate/20111010202847_create_issue_checklists.rb index e03181b..088b36d 100644 --- a/db/migrate/20111010202847_create_issue_checklists.rb +++ b/db/migrate/20111010202847_create_issue_checklists.rb @@ -1,4 +1,4 @@ -class CreateIssueChecklists < ActiveRecord::Migration +class CreateIssueChecklists < ActiveRecord::Migration[4.2] def self.up create_table :issue_checklists do |t| t.boolean :is_done, default: false diff --git a/init.rb b/init.rb index 2762b0d..1bd0715 100644 --- a/init.rb +++ b/init.rb @@ -1,7 +1,9 @@ require 'redmine' +require 'acts_as_list' require 'redmine_issue_checklist/redmine_issue_checklist' + Redmine::Plugin.register :redmine_issue_checklist do name 'Redmine Issue Checklist Plugin' author 'Kirill Bezrukov' diff --git a/lib/redmine_issue_checklist/patches/issue_patch.rb b/lib/redmine_issue_checklist/patches/issue_patch.rb index 7d485b5..4e2e2d0 100644 --- a/lib/redmine_issue_checklist/patches/issue_patch.rb +++ b/lib/redmine_issue_checklist/patches/issue_patch.rb @@ -8,7 +8,9 @@ module IssuePatch def self.included(base) # :nodoc: base.send(:include, InstanceMethods) base.class_eval do - alias_method_chain :copy_from, :checklist + + alias_method :copy_from_without_checklist,:copy_from + alias_method :copy_from, :copy_from_with_checklist has_many :checklist, class_name: 'IssueChecklist', dependent: :destroy end diff --git a/lib/redmine_issue_checklist/patches/issues_controller_patch.rb b/lib/redmine_issue_checklist/patches/issues_controller_patch.rb index b6bbeee..7eaa53c 100644 --- a/lib/redmine_issue_checklist/patches/issues_controller_patch.rb +++ b/lib/redmine_issue_checklist/patches/issues_controller_patch.rb @@ -4,7 +4,9 @@ module IssuesControllerPatch extend ActiveSupport::Concern included do - alias_method_chain :build_new_issue_from_params, :checklist +# alias_method_chain :build_new_issue_from_params, :checklist + alias_method :build_new_issue_from_params_without_checklist,:build_new_issue_from_params + alias_method :build_new_issue_from_params, :build_new_issue_from_params_with_checklist end def build_new_issue_from_params_with_checklist