diff --git a/app/controllers/public/content_viewer_controller.rb b/app/controllers/public/content_viewer_controller.rb index fb807a8..15a3e74 100644 --- a/app/controllers/public/content_viewer_controller.rb +++ b/app/controllers/public/content_viewer_controller.rb @@ -7,6 +7,7 @@ class ContentViewerController < ApplicationController def view_page path = params[:page] + path = path.join('/') if path.kind_of?(Array) path = "#{path}.#{params[:format]}" if params[:format] @version = params[:version].to_i diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb index 8c26e6f..4ae851d 100644 --- a/app/helpers/layout_helper.rb +++ b/app/helpers/layout_helper.rb @@ -9,7 +9,7 @@ module LayoutHelper end def noosfero_javascript - plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten + plugins_javascripts = @plugins.map { |plugin| [plugin.js_files].flatten.map { |js| plugin.class.public_path(js) } }.flatten output = '' output += render :file => 'layouts/_javascript' diff --git a/app/models/box.rb b/app/models/box.rb index 4507a63..7377892 100644 --- a/app/models/box.rb +++ b/app/models/box.rb @@ -3,6 +3,8 @@ class Box < ActiveRecord::Base acts_as_list :scope => 'owner_id = #{owner_id} and owner_type = \'#{owner_type}\'' has_many :blocks, :dependent => :destroy, :order => 'position' + attr_accessible :owner + include Noosfero::Plugin::HotSpot def environment -- libgit2 0.21.2