Download as
Browse Code »

Commit 486e450c98f4730bd066262e929845ce4baad4fc

Authored by Daniela Feitosa
1 parent 083d29d3
Exists in master and in 18 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, event_layout, fix_forum, fix_suggest_article, folder_improvments, news_page, script_to_update, template_mirror_block, tests, tests_fixies

blocks: make sure limit is integer on get_limit 

Blocks configured before the definition of limit type were strings and were
crashing
Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
app/models/block.rb
  Diff comments   View file @486e450
... ... @@ -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 @486e450
... ... @@ -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
... ...