Download as
Browse Code »

Commit a4885f4d8c8fcfec6415e8c1d9e96a1600a5da53

Authored by LeandroNunes
1 parent 0ca6ba5a
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

ActionItem85: bli 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@794 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
app/controllers/environment_admin/admin_panel_controller.rb
  Diff comments   View file @a4885f4
@@ -2,10 +2,10 @@ class AdminPanelController < EnvironmentAdminController @@ -2,10 +2,10 @@ class AdminPanelController < EnvironmentAdminController
2 2
3 protect [:index], 'view_environment_admin_panel', :environment 3 protect [:index], 'view_environment_admin_panel', :environment
4 4
5 - design :holder => 'environment'  
6 -  
7 before_filter :load_default_enviroment 5 before_filter :load_default_enviroment
8 6
  7 + design :holder => 'environment'
  8 +
9 def load_default_enviroment 9 def load_default_enviroment
10 @environment = Environment.default 10 @environment = Environment.default
11 end 11 end
app/controllers/public/account_controller.rb
  Diff comments   View file @a4885f4
1 class AccountController < PublicController 1 class AccountController < PublicController
2 2
3 - design :holder => 'environment'  
4 -  
5 before_filter :load_default_environment 3 before_filter :load_default_environment
6 4
  5 + design :holder => 'environment'
  6 +
7 def load_default_environment 7 def load_default_environment
8 @environment = Environment.default 8 @environment = Environment.default
9 end 9 end
app/controllers/public/category_controller.rb
  Diff comments   View file @a4885f4
1 class CategoryController < ApplicationController 1 class CategoryController < ApplicationController
2 2
3 - design :holder => 'environment'  
4 -  
5 before_filter :load_default_enviroment 3 before_filter :load_default_enviroment
6 4
  5 + design :holder => 'environment'
  6 +
7 def load_default_enviroment 7 def load_default_enviroment
8 @environment = Environment.default 8 @environment = Environment.default
9 end 9 end