Download as
Browse Code »

Commit a3b758922c24b4fcff6e3caaf996f705584e3a31

Authored by Victor Costa
1 parent c4617c42
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails3: small fixes

Showing 3 changed files with 4 additions and 1 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @a3b7589
@@ -7,6 +7,7 @@ class ContentViewerController < ApplicationController @@ -7,6 +7,7 @@ class ContentViewerController < ApplicationController
7 7
8 def view_page 8 def view_page
9 path = params[:page] 9 path = params[:page]
  10 + path = path.join('/') if path.kind_of?(Array)
10 path = "#{path}.#{params[:format]}" if params[:format] 11 path = "#{path}.#{params[:format]}" if params[:format]
11 @version = params[:version].to_i 12 @version = params[:version].to_i
12 13
app/helpers/layout_helper.rb
  Diff comments   View file @a3b7589
@@ -9,7 +9,7 @@ module LayoutHelper @@ -9,7 +9,7 @@ module LayoutHelper
9 end 9 end
10 10
11 def noosfero_javascript 11 def noosfero_javascript
12 - plugins_javascripts = @plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten 12 + plugins_javascripts = @plugins.map { |plugin| [plugin.js_files].flatten.map { |js| plugin.class.public_path(js) } }.flatten
13 13
14 output = '' 14 output = ''
15 output += render :file => 'layouts/_javascript' 15 output += render :file => 'layouts/_javascript'
app/models/box.rb
  Diff comments   View file @a3b7589
@@ -3,6 +3,8 @@ class Box < ActiveRecord::Base @@ -3,6 +3,8 @@ class Box < ActiveRecord::Base
3 acts_as_list :scope => 'owner_id = #{owner_id} and owner_type = \'#{owner_type}\'' 3 acts_as_list :scope => 'owner_id = #{owner_id} and owner_type = \'#{owner_type}\''
4 has_many :blocks, :dependent => :destroy, :order => 'position' 4 has_many :blocks, :dependent => :destroy, :order => 'position'
5 5
  6 + attr_accessible :owner
  7 +
6 include Noosfero::Plugin::HotSpot 8 include Noosfero::Plugin::HotSpot
7 9
8 def environment 10 def environment