Download as
Browse Code »

Commit 515b68a050717f35df592eaba093c6012da3e54d

Authored by AntonioTerceiro
1 parent 80cbe729
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

ActionItem682: don't query for profile, but for the block owner 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/branches/0.11.x@2520 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 24 additions and 3 deletions   Show diff stats
app/helpers/boxes_helper.rb
  Diff comments   View file @515b68a
@@ -151,13 +151,14 @@ module BoxesHelper @@ -151,13 +151,14 @@ module BoxesHelper
151 buttons << icon_button(:down, _('Move block down'), { :action => 'move_block_down' ,:id => block.id }, { :method => 'post'}) 151 buttons << icon_button(:down, _('Move block down'), { :action => 'move_block_down' ,:id => block.id }, { :method => 'post'})
152 end 152 end
153 153
  154 + holder = block.owner
154 # move to opposite side 155 # move to opposite side
155 # FIXME too much hardcoded stuff 156 # FIXME too much hardcoded stuff
156 - if profile.layout_template == 'default' 157 + if holder.layout_template == 'default'
157 if block.box.position == 2 # area 2, left side => move to right side 158 if block.box.position == 2 # area 2, left side => move to right side
158 - buttons << icon_button('right', _('Move to the opposite side'), { :action => 'move_block', :target => 'end-of-box-' + profile.boxes[2].id.to_s, :id => block.id }, :method => 'post' ) 159 + buttons << icon_button('right', _('Move to the opposite side'), { :action => 'move_block', :target => 'end-of-box-' + holder.boxes[2].id.to_s, :id => block.id }, :method => 'post' )
159 elsif block.box.position == 3 # area 3, right side => move to left side 160 elsif block.box.position == 3 # area 3, right side => move to left side
160 - buttons << icon_button('left', _('Move to the opposite side'), { :action => 'move_block', :target => 'end-of-box-' + profile.boxes[1].id.to_s, :id => block.id }, :method => 'post' ) 161 + buttons << icon_button('left', _('Move to the opposite side'), { :action => 'move_block', :target => 'end-of-box-' + holder.boxes[1].id.to_s, :id => block.id }, :method => 'post' )
161 end 162 end
162 end 163 end
163 164
app/models/environment.rb
  Diff comments   View file @515b68a
@@ -306,6 +306,14 @@ class Environment &lt; ActiveRecord::Base @@ -306,6 +306,14 @@ class Environment &lt; ActiveRecord::Base
306 self[:theme] || 'default' 306 self[:theme] || 'default'
307 end 307 end
308 308
  309 + def layout_template
  310 + settings[:layout_template] || 'default'
  311 + end
  312 +
  313 + def layout_template=(value)
  314 + settings[:layout_template] = value
  315 + end
  316 +
309 def enterprise_template 317 def enterprise_template
310 Enterprise.find_by_id settings[:enterprise_template_id] 318 Enterprise.find_by_id settings[:enterprise_template_id]
311 end 319 end
test/functional/environment_design_controller_test.rb
  Diff comments   View file @515b68a
@@ -48,6 +48,9 @@ class EnvironmentDesignControllerTest &lt; Test::Unit::TestCase @@ -48,6 +48,9 @@ class EnvironmentDesignControllerTest &lt; Test::Unit::TestCase
48 end 48 end
49 49
50 should 'create back link to environment control panel' do 50 should 'create back link to environment control panel' do
  51 + Environment.default.boxes.create!.blocks << CommunitiesBlock.new
  52 + Environment.default.boxes.create!.blocks << EnterprisesBlock.new
  53 + Environment.default.boxes.create!.blocks << LoginBlock.new
51 login_as(create_admin_user(Environment.default)) 54 login_as(create_admin_user(Environment.default))
52 get :index 55 get :index
53 56
test/unit/environment_test.rb
  Diff comments   View file @515b68a
@@ -419,4 +419,13 @@ class EnvironmentTest &lt; Test::Unit::TestCase @@ -419,4 +419,13 @@ class EnvironmentTest &lt; Test::Unit::TestCase
419 assert_equal true, e.disable_ssl 419 assert_equal true, e.disable_ssl
420 end 420 end
421 421
  422 + should 'have a layout template' do
  423 + e = Environment.new(:layout_template => 'mytemplate')
  424 + assert_equal 'mytemplate', e.layout_template
  425 + end
  426 +
  427 + should 'have a default layout template' do
  428 + assert_equal 'default', Environment.new.layout_template
  429 + end
  430 +
422 end 431 end