Download as
Browse Code »

Commit 99802bbe604076e7b6590afe1817c1cf740c6d64

Authored by Antonio Terceiro
1 parent c6b8f1f6
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

@controller → controller 

Now the home page works
Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @99802bb
... ... @@ -296,7 +296,7 @@ module ApplicationHelper
296 296 def partial_for_class(klass, prefix=nil, suffix=nil)
297 297 raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?' if klass.nil?
298 298 name = klass.name.underscore
299   - @controller.view_paths.each do |view_path|
  299 + controller.view_paths.each do |view_path|
300 300 partial = partial_for_class_in_view_path(klass, view_path, prefix, suffix)
301 301 return partial if partial
302 302 end
... ...
app/helpers/boxes_helper.rb
  Diff comments   View file @99802bb
1 1 module BoxesHelper
2 2  
3 3 def insert_boxes(content)
4   - if controller.send(:boxes_editor?) && @controller.send(:uses_design_blocks?)
  4 + if controller.send(:boxes_editor?) && controller.send(:uses_design_blocks?)
5 5 content + display_boxes_editor(controller.boxes_holder)
6 6 else
7 7 maybe_display_custom_element(controller.boxes_holder, :custom_header_expanded, :id => 'profile-header') +
... ...
app/helpers/layout_helper.rb
  Diff comments   View file @99802bb
... ... @@ -2,8 +2,8 @@ module LayoutHelper
2 2  
3 3 def body_classes
4 4 # Identify the current controller and action for the CSS:
5   - " controller-#{@controller.controller_name}" +
6   - " action-#{@controller.controller_name}-#{@controller.action_name}" +
  5 + " controller-#{controller.controller_name}" +
  6 + " action-#{controller.controller_name}-#{controller.action_name}" +
7 7 " template-#{profile.nil? ? "default" : profile.layout_template}" +
8 8 (!profile.nil? && profile.is_on_homepage?(request.path,@page) ? " profile-homepage" : "")
9 9 end
... ...