Download as
Browse Code »

Commit 8fdf6ddf3b6731501c135a9f55d2c5ca18938d00

Authored by AntonioTerceiro
1 parent 28a4bf83
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem154: cleaning up; modularizing the load_profile behaviour 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1255 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 8 additions and 7 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @8fdf6dd
... ... @@ -53,12 +53,7 @@ class ApplicationController < ActionController::Base
53 53 def render_not_found(path = nil)
54 54 @path ||= request.path
55 55 # raise "#{@path} not found"
56   - render(:file => File.join(RAILS_ROOT, 'app', 'views', 'shared', 'not_found.rhtml'), :layout => 'not_found', :status => 404) && false
57   - end
58   -
59   - def load_profile
60   - @profile = Profile.find_by_identifier(params[:profile])
61   - render_not_found unless @profile
  56 + render(:file => File.join(RAILS_ROOT, 'app', 'views', 'shared', 'not_found.rhtml'), :layout => 'not_found', :status => 404) && fal
62 57 end
63 58  
64 59 def user
... ...
app/controllers/public/profile_controller.rb
  Diff comments   View file @8fdf6dd
1 1 class ProfileController < ApplicationController
  2 + needs_profile
2 3 end
... ...
app/helpers/application_helper.rb
  Diff comments   View file @8fdf6dd
... ... @@ -162,7 +162,7 @@ module ApplicationHelper
162 162 # should be a current profile (i.e. while viewing some profile's pages, or the
163 163 # profile info, etc), because if there is no profile an exception is thrown.
164 164 def profile
165   - @profile || raise("There is no current profile")
  165 + @controller.send(:profile) || raise("There is no current profile")
166 166 end
167 167  
168 168 # create a form field structure (as if it were generated with
... ...
lib/needs_profile.rb
  Diff comments   View file @8fdf6dd
... ... @@ -20,4 +20,9 @@ module NeedsProfile
20 20 @profile
21 21 end
22 22  
  23 + def load_profile
  24 + @profile = Profile.find_by_identifier(params[:profile])
  25 + render_not_found unless @profile
  26 + end
  27 +
23 28 end
... ...