Download as
Browse Code »

Commit b95442c7e0b09959639dc28fbec273abaf0bf919

Authored by Joenio Costa
1 parent 645a7610
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

Discard view_paths added by Noosfero's plugins 

(ActionItem2244)
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @b95442c
@@ -1154,7 +1154,7 @@ module ApplicationHelper @@ -1154,7 +1154,7 @@ module ApplicationHelper
1154 def render_environment_features(folder) 1154 def render_environment_features(folder)
1155 result = '' 1155 result = ''
1156 environment.enabled_features.keys.each do |feature| 1156 environment.enabled_features.keys.each do |feature|
1157 - file = File.join(@controller.view_paths, 'shared', folder.to_s, "#{feature}.rhtml") 1157 + file = File.join(@controller.view_paths.last, 'shared', folder.to_s, "#{feature}.rhtml")
1158 if File.exists?(file) 1158 if File.exists?(file)
1159 result << render(:file => file, :use_full_path => false) 1159 result << render(:file => file, :use_full_path => false)
1160 end 1160 end
test/unit/application_helper_test.rb
  Diff comments   View file @b95442c
@@ -603,7 +603,7 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase @@ -603,7 +603,7 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
603 603
604 @controller = ApplicationController.new 604 @controller = ApplicationController.new
605 path = File.join(RAILS_ROOT, 'app', 'views') 605 path = File.join(RAILS_ROOT, 'app', 'views')
606 - @controller.stubs(:view_paths).returns(path) 606 + @controller.stubs(:view_paths).returns([path])
607 607
608 file = path + '/shared/usermenu/xmpp_chat.rhtml' 608 file = path + '/shared/usermenu/xmpp_chat.rhtml'
609 expects(:render).with(:file => file, :use_full_path => false).returns('Open chat') 609 expects(:render).with(:file => file, :use_full_path => false).returns('Open chat')