Download as
Browse Code »

Commit 290c4b8ed97cbce2a4b3d96a3b1ba9c9a105e68e

Authored by Rodrigo Souto
1 parent d35bce8d
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

application-helper: allow theme_include to receive options 

(ActionItem2950)
Showing 1 changed file with 3 additions and 2 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @290c4b8
@@ -407,10 +407,11 @@ module ApplicationHelper @@ -407,10 +407,11 @@ module ApplicationHelper
407 nil 407 nil
408 end 408 end
409 409
410 - def theme_include(template) 410 + def theme_include(template, options = {})
411 file = theme_view_file(template) 411 file = theme_view_file(template)
  412 + options.merge!({:file => file, :use_full_path => false})
412 if file 413 if file
413 - render :file => file, :use_full_path => false 414 + render options
414 else 415 else
415 nil 416 nil
416 end 417 end