From fa41723c111bd5ae9fb481d3a4bf2fc215749e50 Mon Sep 17 00:00:00 2001
From: Alexander Meindl <a.meindl@alphanodes.com>
Date: Mon, 8 Apr 2024 18:12:16 +0200
Subject: [PATCH] fix problem with asset pipeline
 https://www.redmine.org/issues/39111 and rubocop fixes

---
 app/models/additionals_query.rb | 7 +++----
 init.rb                         | 2 +-
 lib/additionals/helpers.rb      | 6 +-----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/models/additionals_query.rb b/app/models/additionals_query.rb
index fedfbcc7..8f9c3a47 100644
--- a/app/models/additionals_query.rb
+++ b/app/models/additionals_query.rb
@@ -31,10 +31,9 @@ module AdditionalsQuery
   def sql_for_enabled_module(table_field, module_names)
     module_names = Array module_names
 
-    sql = []
-    module_names.each do |module_name|
-      sql << "EXISTS(SELECT 1 FROM #{EnabledModule.table_name} WHERE #{EnabledModule.table_name}.project_id=#{table_field}" \
-             " AND #{EnabledModule.table_name}.name='#{module_name}')"
+    sql = module_names.map do |module_name|
+      "EXISTS(SELECT 1 FROM #{EnabledModule.table_name} WHERE #{EnabledModule.table_name}.project_id=#{table_field}" \
+        " AND #{EnabledModule.table_name}.name='#{module_name}')"
     end
 
     sql.join ' AND '
diff --git a/init.rb b/init.rb
index 0be7d303..2e6c0677 100644
--- a/init.rb
+++ b/init.rb
@@ -12,7 +12,7 @@ Redmine::Plugin.register :additionals do
   version Additionals::PluginVersion::VERSION
   author_url 'https://alphanodes.com/'
   url 'https://github.com/alphanodes/additionals'
-  directory __dir__
+  directory File.dirname(__FILE__)
 
   settings default: loader.default_settings,
            partial: 'additionals/settings/additionals'
diff --git a/lib/additionals/helpers.rb b/lib/additionals/helpers.rb
index 9e36b6e6..bd458e89 100644
--- a/lib/additionals/helpers.rb
+++ b/lib/additionals/helpers.rb
@@ -108,11 +108,7 @@ module Additionals
     end
 
     def additionals_library_load(module_names)
-      s = []
-      Array(module_names).each do |module_name|
-        s << send(:"additionals_load_#{module_name}")
-      end
-      safe_join s
+      safe_join(Array(module_names).map { |module_name| send(:"additionals_load_#{module_name}") })
     end
 
     def autocomplete_select_entries(name, type, option_tags, **options)