From 6edafc75557df3ba3db072d36f8a1ab20886635c Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Fri, 10 Apr 2015 16:28:49 -0300 Subject: [PATCH] asset-pipeline: fix plugins stylesheets and javascripts --- app/helpers/layout_helper.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb index fda8028..7fd0def 100644 --- a/app/helpers/layout_helper.rb +++ b/app/helpers/layout_helper.rb @@ -28,7 +28,7 @@ module LayoutHelper end def noosfero_javascript - plugins_javascripts = @plugins.map { |plugin| [plugin.js_files].flatten.map { |js| plugin.class.public_path(js, true) } }.flatten + plugins_javascripts = @plugins.flat_map{ |plugin| plugin.js_files.map{ |js| plugin.class.public_path(js, true) } }.flatten output = '' output += render 'layouts/javascript' @@ -43,7 +43,7 @@ module LayoutHelper def noosfero_stylesheets plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| - plugin.class.public_path('style.css') + plugin.class.public_path('style.css', true) } global_css_pub = "/designs/themes/#{environment.theme}/global.css" global_css_at_fs = Rails.root.join 'public' + global_css_pub @@ -54,8 +54,9 @@ module LayoutHelper output << stylesheet_link_tag(*icon_theme_stylesheet_path) output << stylesheet_link_tag(jquery_ui_theme_stylesheet_path) unless plugins_stylesheets.empty? - cacheid = "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}" - output << stylesheet_link_tag(*plugins_stylesheets, cache: cacheid) + # FIXME: caching does not work with asset pipeline + #cacheid = "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}" + output << stylesheet_link_tag(*plugins_stylesheets) end if File.exists? global_css_at_fs output << stylesheet_link_tag(global_css_pub) -- libgit2 0.21.2