More compact image paths
authorHerve Saint-Amand <git@saintamh.org>
Mon, 2 Jan 2017 23:48:49 +0000 (23:48 +0000)
committerHerve Saint-Amand <git@saintamh.org>
Mon, 2 Jan 2017 23:48:49 +0000 (23:48 +0000)
Make the file paths to image assets more compact. I investigated using `image_path` but could only get it to return the path for a public URL, which is different and also includes the asset pipeline digest.

app/models/notifier.rb

index 40a516a927a388d81d91b0bd8a0012a6102e2def..d01ef07d14e9492f7e30d82f2af7bfbea11b66b0 100644 (file)
@@ -170,7 +170,7 @@ class Notifier < ActionMailer::Base
                   I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
                 end
 
                   I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
                 end
 
-      attachments.inline["logo.png"] = File.read(Rails.root.join("app", "assets", "images", "osm_logo_30.png"))
+      attachments.inline["logo.png"] = File.read("#{Rails.root}/app/assets/images/osm_logo_30.png")
       attachments.inline["avatar.png"] = File.read(user_avatar_file_path(comment.author))
 
       mail :to => recipient.email, :subject => subject
       attachments.inline["avatar.png"] = File.read(user_avatar_file_path(comment.author))
 
       mail :to => recipient.email, :subject => subject
@@ -184,7 +184,7 @@ class Notifier < ActionMailer::Base
     if image.file?
       return image.path(:small)
     else
     if image.file?
       return image.path(:small)
     else
-      return Rails.root.join("app", "assets", "images", "users", "images", "small.png")
+      return "#{Rails.root}/app/assets/images/users/images/small.png"
     end
   end
 
     end
   end