Download as
Browse Code »

Commit ce5a8c2c77a7c5de43353adfb95435b6b8059ae4

Authored by Antonio Terceiro
1 parent 393fd2da
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

ActionItem1049: saner defaults for blog

Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
app/models/blog.rb
  Diff comments   View file @ce5a8c2
@@ -10,7 +10,7 @@ class Blog < Folder @@ -10,7 +10,7 @@ class Blog < Folder
10 blog.feed = blog.feed_attrs 10 blog.feed = blog.feed_attrs
11 end 11 end
12 12
13 - settings_items :posts_per_page, :type => :integer, :default => 20 13 + settings_items :posts_per_page, :type => :integer, :default => 5
14 settings_items :title, :type => :string, :default => N_('Blog') 14 settings_items :title, :type => :string, :default => N_('Blog')
15 15
16 def initialize(*args) 16 def initialize(*args)
app/models/rss_feed.rb
  Diff comments   View file @ce5a8c2
@@ -14,9 +14,9 @@ class RssFeed < Article @@ -14,9 +14,9 @@ class RssFeed < Article
14 end 14 end
15 alias :settings :body 15 alias :settings :body
16 16
17 - # The maximum number of articles to be displayed in the RSS feed. 17 + # The maximum number of articles to be displayed in the RSS feed. Default: 10
18 def limit 18 def limit
19 - settings[:limit] 19 + settings[:limit] || 10
20 end 20 end
21 def limit=(value) 21 def limit=(value)
22 settings[:limit] = value 22 settings[:limit] = value
@@ -68,7 +68,7 @@ class RssFeed < Article @@ -68,7 +68,7 @@ class RssFeed < Article
68 if (self.include == 'parent_and_children') && self.parent 68 if (self.include == 'parent_and_children') && self.parent
69 self.parent.map_traversal 69 self.parent.map_traversal
70 else 70 else
71 - profile.recent_documents(self.limit || 10) 71 + profile.recent_documents(self.limit)
72 end 72 end
73 end 73 end
74 def data 74 def data
app/views/cms/_blog.rhtml
  Diff comments   View file @ce5a8c2
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, [5, 10, 20, 50, 100])) %> 11 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, [5, 10, 20, 50, 100])) %>
12 12
13 <% f.fields_for 'feed', @article.feed do |feed| %> 13 <% f.fields_for 'feed', @article.feed do |feed| %>
14 - <%= labelled_form_field(_('Limit of posts in RSS Feed'), feed.select(:limit, ['5', '10', '20', '50'])) %>  
15 - <%= labelled_form_field(_('Use as description in RSS Feed:'), feed.select(:feed_item_description, [ [ _('Article abstract'), 'abstract'], [ _('Article body'), 'body']])) %> 14 + <%= labelled_form_field(_('Limit of posts in RSS Feed'), feed.select(:limit, [5, 10, 20, 50])) %>
  15 + <%= labelled_form_field(_('Use as description in RSS Feed:'), feed.select(:feed_item_description, [ [ _('Article body'), 'body'], [ _('Article abstract'), 'abstract'] ])) %>
16 <% end %> 16 <% end %>
17 17
18 <% f.fields_for 'external_feed_builder', @article.external_feed do |efeed| %> 18 <% f.fields_for 'external_feed_builder', @article.external_feed do |efeed| %>