Download as
Browse Code »

Commit 8e2f02dc74988c3611e17fded12feb452e5da2be

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

noosfero-steps: fix box fetch on block creation

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @8e2f02d
@@ -20,7 +20,7 @@ class Environment < ActiveRecord::Base @@ -20,7 +20,7 @@ class Environment < ActiveRecord::Base
20 end 20 end
21 21
22 NUMBER_OF_BOXES = 4 22 NUMBER_OF_BOXES = 4
23 - 23 +
24 PERMISSIONS['Environment'] = { 24 PERMISSIONS['Environment'] = {
25 'view_environment_admin_panel' => N_('View environment admin panel'), 25 'view_environment_admin_panel' => N_('View environment admin panel'),
26 'edit_environment_features' => N_('Edit environment features'), 26 'edit_environment_features' => N_('Edit environment features'),
features/step_definitions/noosfero_steps.rb
  Diff comments   View file @8e2f02d
@@ -94,8 +94,8 @@ Given /^the following blocks$/ do |table| @@ -94,8 +94,8 @@ Given /^the following blocks$/ do |table|
94 owner.boxes<< Box.new 94 owner.boxes<< Box.new
95 owner.boxes.first.blocks << MainBlock.new 95 owner.boxes.first.blocks << MainBlock.new
96 end 96 end
97 - box_id = owner.boxes.where(:position => [3])  
98 - klass.constantize.create!(item.merge(:box_id => box_id)) 97 + box = owner.boxes.where(:position => 3).first
  98 + klass.constantize.create!(item.merge(:box => box))
99 end 99 end
100 end 100 end
101 101