Download as
Browse Code »

Commit 959b51a1c1ed5a0ad60277516c86b706bfc28785

Authored by Antonio Terceiro
2 parents b89c9cca cea9db41
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge branch 'AI3237-slideshow_block_bug' into 'master' 

Ai3237 slideshow block bug

Fixing rails3 bug: http://noosfero.org/Development/ActionItem3237

See merge request !269
Showing 1 changed file with 2 additions and 0 deletions   Show diff stats
app/models/slideshow_block.rb
  Diff comments   View file @959b51a
... ... @@ -6,6 +6,8 @@ class SlideshowBlock < Block
6 6 settings_items :navigation, :type => 'boolean', :default => false
7 7 settings_items :image_size, :type => 'string', :default => 'thumb'
8 8  
  9 + attr_accessible :gallery_id, :image_size, :interval, :shuffle, :navigation
  10 +
9 11 def self.description
10 12 _('Slideshow')
11 13 end
... ...