From 49890882a5c4d83339e264c7d8950c375039a1fb Mon Sep 17 00:00:00 2001 From: Lukasz Rekucki Date: Thu, 20 Aug 2009 23:20:05 +0200 Subject: [PATCH 1/1] =?utf8?q?Poprawki=20zwi=C4=85zane=20z=20przej=C5=9Bci?= =?utf8?q?em=20na=20redmine=200.9.x;=20refs=20#25?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- init.rb | 7 ++++--- lib/issue_publication_hook.rb | 22 ++++++++++++++++++---- lib/redmine_publications/issue_patch.rb | 10 ++-------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/init.rb b/init.rb index f2b5b59..b1739c3 100644 --- a/init.rb +++ b/init.rb @@ -2,10 +2,11 @@ require 'redmine' # Patches to the Redmine core. require 'dispatcher' - + Dispatcher.to_prepare :redmine_publications do require_dependency 'issue' - # Guards against including the module multiple time (like in tests) + + #Guards against including the module multiple time (like in tests) # and registering multiple callbacks unless Issue.included_modules.include? RedminePublications::IssuePatch Issue.send(:include, RedminePublications::IssuePatch) @@ -27,7 +28,7 @@ Redmine::Plugin.register :redmine_publications do menu :application_menu, :publications, { :controller => 'publications', :action => 'index' }, :caption => 'Publikacje' - requires_redmine :version_or_higher => '0.8.0' +# requires_redmine :version_or_higher => '0.8.0' end diff --git a/lib/issue_publication_hook.rb b/lib/issue_publication_hook.rb index 9c97233..77fa215 100644 --- a/lib/issue_publication_hook.rb +++ b/lib/issue_publication_hook.rb @@ -3,7 +3,7 @@ class IssuesPublicationHook < Redmine::Hook::ViewListener def view_issues_show_details_bottom(context) # TODO: złapać wyjątek konwersji - if context[:issue].tracker_id == Setting.plugin_redmine_publications['tracker'].to_i + if context[:issue].tracker_id == Setting.plugin_redmine_publications[:tracker].to_i result = "Publication(s):" names = context[:issue].publication_names {|name| "" + name + ""} result << names.join(', ') @@ -12,11 +12,25 @@ class IssuesPublicationHook < Redmine::Hook::ViewListener end def controller_issues_edit_before_save(context) - if context[:issue].tracker_id == Setting.plugin_redmine_publications['tracker'].to_i - pub_field = context[:params][:publications] - context[:issue].publication_names = pub_field.split(',').map { |n| n.strip } + if context[:issue].tracker.id == Setting.plugin_redmine_publications[:tracker].to_i + old_value = context[:issue].publication_names + new_value = context[:params][:publications].split(',').map { |n| n.strip } + context[:journal].details << JournalDetail.new( + :property => 'attr', :prop_key => "publications", + :old_value => old_value.join(', '), + :value => new_value.join(', ') ) unless new_value==old_value + context[:issue].publication_names = new_value end end + + def controller_issues_new_after_save(context) + if context[:issue].tracker.id == Setting.plugin_redmine_publications[:tracker].to_i + value = context[:params][:publications].split(',').map { |n| n.strip } + context[:issue].publication_names = value + context[:issue].save + end + end + render_on :view_issues_form_details_bottom, :partial => 'issue_form_pub' end diff --git a/lib/redmine_publications/issue_patch.rb b/lib/redmine_publications/issue_patch.rb index f8a83c4..c108799 100644 --- a/lib/redmine_publications/issue_patch.rb +++ b/lib/redmine_publications/issue_patch.rb @@ -12,13 +12,7 @@ module RedminePublications unloadable # Send unloadable so it will not be unloaded in development validate :check_relations - after_save :update_relations - - # Add visible to Redmine 0.8.x - unless respond_to?(:visible) - named_scope :visible, lambda {|*args| { :include => :project, - :conditions => Project.allowed_to_condition(args.first || User.current, :view_issues) } } - end + after_save :update_relations end end @@ -61,9 +55,9 @@ module RedminePublications end def update_relations - self.reload old = self.publications current_names = self.publication_names + Rails.logger.info('[INFO] Updating relations: old= ' << old.inspect << ' current=' << current_names.inspect) # delete unused relations deleted = old.select { |v| not (current_names.include?(v.name)) } -- 2.20.1