Redmine

Thanks! I will take a look these days.

I'm not sure which is the best solution that can be delivered in a patch version, any ideea is welcome!

Marius BĂLTEANU wrote in #note-9:

I've committed the fix.

Awesome! Thanks :)

After trying it I don't think this is probably fixed.

1. Looks to me you can now only have one plugin which registers as an ActivityProvider. Icons only work for one loaded plugin.

1. We have a class which inherites from Journal, which acts_as_activity_provider for issues. So

   e.activity_provider_options.keys[0]

   ends up as 'issues' and not the wanted key.

I came up with this diff, so plugins can register like this for their classes:

Redmine::Activity.map do |activity|
  activity.register :test_activities, class_name: %w(TestActivity), plugin: :activity_test
end

Also works for multiple plugins with ActivityProviders.

---
 app/views/activities/_activities.html.erb |  2 +-
 lib/redmine/activity.rb                   | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/views/activities/_activities.html.erb b/app/views/activities/_activities.html.erb
index 21ec1fb28..f2d8e22bd 100644
--- a/app/views/activities/_activities.html.erb
+++ b/app/views/activities/_activities.html.erb
@@ -4,7 +4,7 @@
 <dl>
 <% sort_activity_events(events_by_day[day]).each do |e, in_group| -%>
   <dt class="<%= e.event_type %> icon icon-<%= e.event_type %> <%= "grouped" if in_group %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
-  <%= activity_event_type_icon e.event_type, plugin: Redmine::Activity.plugin_name(e.activity_provider_options.keys[0]) %>
+  <%= activity_event_type_icon e.event_type, plugin: Redmine::Activity.plugin_name(e.class) %>
   <%= avatar(e.event_author) if e.respond_to?(:event_author) %>
   <span class="time"><%= format_time(e.event_datetime, false) %></span>
   <%= content_tag('span', e.project, :class => 'project') if @project.nil? || @project != e.project %>
diff --git a/lib/redmine/activity.rb b/lib/redmine/activity.rb
index 826b81c9e..3189f4fb1 100644
--- a/lib/redmine/activity.rb
+++ b/lib/redmine/activity.rb
@@ -19,11 +19,11 @@

 module Redmine
   module Activity
-    mattr_accessor :available_event_types, :default_event_types, :plugins_event_types, :providers
+    mattr_accessor :available_event_types, :default_event_types, :plugins_event_classes, :providers

     @@available_event_types = []
     @@default_event_types = []
-    @@plugins_event_types = {}
+    @@plugins_event_classes = {}
     @@providers = Hash.new {|h, k| h[k]=[]}

     class << self
@@ -41,19 +41,22 @@ module Redmine

         @@available_event_types << event_type unless @@available_event_types.include?(event_type)
         @@default_event_types << event_type unless options[:default] == false
-        @@plugins_event_types = { event_type => options[:plugin].to_s } unless options[:plugin].nil?
+        if options[:plugin]
+          providers.each do | provider |
+            @@plugins_event_classes[provider] = options[:plugin].to_s
+          end
+        end
         @@providers[event_type] += providers
       end

       def delete(event_type)
         @@available_event_types.delete event_type
         @@default_event_types.delete event_type
-        @@plugins_event_types.delete(event_type)
         @@providers.delete(event_type)
       end

-      def plugin_name(event_type)
-        @@plugins_event_types[event_type]
+      def plugin_name(class_name)
+        @@plugins_event_classes[class_name.to_s]
       end
     end
   end
-- 
2.43.0

Hi, any news on this issue and my proposed fix? Thanks.

Stefan Rinkes wrote in #note-15:

Hi, any news on this issue and my proposed fix? Thanks.

I will take a look again on this, please expect a proper solution in 6.0.4. Version 6.0.3 is released these days.