Download as
Browse Code »

Commit 17dff5dd289cacb2a4e4cce9a422604c3e961358

Authored by Antonio Terceiro
2 parents 083d29d3 486e450c
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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,7 +23,7 @@ class Block < ActiveRecord::Base
23 end 23 end
24 24
25 def get_limit 25 def get_limit
26 - [0,limit].max 26 + [0,limit.to_i].max
27 end 27 end
28 28
29 def embed_code 29 def embed_code
test/unit/block_test.rb
  Diff comments   View file @17dff5d
@@ -330,4 +330,11 @@ class BlockTest < ActiveSupport::TestCase @@ -330,4 +330,11 @@ class BlockTest < ActiveSupport::TestCase
330 block.save! 330 block.save!
331 assert !block.display_to_user?(person_friend) 331 assert !block.display_to_user?(person_friend)
332 end 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 end 340 end