Download as
Browse Code »

Commit 17dff5dd289cacb2a4e4cce9a422604c3e961358

Authored by Antonio Terceiro
2 parents 083d29d3 486e450c
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

Merge branch 'block_limit' into 'master' 

blocks: make sure limit is integer on get_limit

Blocks configured before the definition of limit type were strings and were
crashing

See merge request !558
Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
app/models/block.rb
  Diff comments   View file @17dff5d
... ... @@ -23,7 +23,7 @@ class Block < ActiveRecord::Base
23 23 end
24 24  
25 25 def get_limit
26   - [0,limit].max
  26 + [0,limit.to_i].max
27 27 end
28 28  
29 29 def embed_code
... ...
test/unit/block_test.rb
  Diff comments   View file @17dff5d
... ... @@ -330,4 +330,11 @@ class BlockTest < ActiveSupport::TestCase
330 330 block.save!
331 331 assert !block.display_to_user?(person_friend)
332 332 end
  333 +
  334 + should 'get limit as a number when limit is string' do
  335 + block = RecentDocumentsBlock.new
  336 + block.settings[:limit] = '5'
  337 + assert block.get_limit.is_a?(Fixnum)
  338 + end
  339 +
333 340 end
... ...