Redmine 5 compatibility: do not change non-private notes with attachm…

…ents behaviour

lib/redmine_comments/application_helper_patch.rb

@@ -23,7 +23,7 @@ def parse_inline_attachments(text, project, obj, attr, only_path, options)
           if !desc.blank? && alttext.blank?
             alt = " title=\"#{desc}\" alt=\"#{desc}\""
           end
-          "src=\"#{image_url}\"#{alt} loading=\"lazy\""
+          "src=\"#{image_url}\"#{alt}#{" loading=\"lazy\"" if Redmine::VERSION::MAJOR >= 5}"
         else
           m
         end

lib/redmine_comments/journal_patch.rb

@@ -9,10 +9,13 @@ class Journal < ActiveRecord::Base
 
   acts_as_attachable
 
-  # Ensure method :attachments is removed
-  def attachments; end
-
-  remove_method :attachments
+  def attachments
+    if private_notes?
+      super
+    else
+      standard_attachments_method
+    end
+  end
 
   has_many :journal_roles, dependent: :destroy
   has_many :roles, through: :journal_roles
@@ -27,7 +30,8 @@ def journal_attachments
   end
 
   def standard_attachments_method
-    journalized.respond_to?(:attachments) ? journalized.attachments : []
+    ids = details.select {|d| d.property == 'attachment' && d.value.present?}.map(&:prop_key)
+    Attachment.where(id: ids).sort_by {|a| ids.index(a.id.to_s)}
   end
 
   # Returns a SQL condition to filter out journals with notes that are not visible to user