added a setting option to set the feeds content limit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@346 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
index 46e8ae05cd3a2e3b3243d1494d4a0a1005ee9c63..20ae6f25442cd8fe820656c17f29471cdbe77e3c 100644 (file)
--- a/app/controllers/feeds_controller.rb
+++ b/app/controllers/feeds_controller.rb
@@ -27,7 +27,7 @@ class FeedsController < ApplicationController
   # news feeds
   def news
     News.with_scope(:find => @find_options) do
-      @news = News.find :all, :order => "#{News.table_name}.created_on DESC", :limit => 10, :include => [ :author, :project ]
+      @news = News.find :all, :order => "#{News.table_name}.created_on DESC", :include => [ :author, :project ]
     end
     headers["Content-Type"] = "application/rss+xml"
     render :action => 'news_atom' if 'atom' == params[:format]
@@ -94,7 +94,7 @@ private
       # global feed
       scope = ["#{Project.table_name}.is_public=?", true]
     end
-    @find_options = {:conditions => scope, :limit => 10}
+    @find_options = {:conditions => scope, :limit => Setting.feeds_limit}
     return true
   end
 end

diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index aac4ab686e0960a3d3aa9a5a2dc0eabf7802d147..4bdea07b97eb4aa2498dd4988ccfe21bdf001049 100644 (file)
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -1,5 +1,6 @@
 <h2><%= l(:label_settings) %></h2>
 
+<div id="settings">
 <% form_tag({:action => 'edit'}, :class => "tabular") do %>
 <div class="box">
 <p><label><%= l(:setting_app_title) %></label>
@@ -41,6 +42,10 @@
 <p><label><%= l(:setting_wiki_compression) %></label>
 <%= select_tag 'settings[wiki_compression]', options_for_select( [[l(:label_none), 0], ["gzip", "gzip"]], Setting.wiki_compression) %></p>
 
+<p><label><%= l(:setting_feeds_limit) %></label>
+<%= text_field_tag 'settings[feeds_limit]', Setting.feeds_limit, :size => 6 %></p>
+
 </div>
 <%= submit_tag l(:button_save) %>
+</div>
 <% end %>
\ No newline at end of file

diff --git a/config/settings.yml b/config/settings.yml
index 8961d34a0a011de3445853eadbb5fa89cb99309c..c3292e5164037d8e267489d07e0a23d0abdf2c57 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -46,4 +46,7 @@ wiki_compression:
 default_language:\r
   default: en\r
 host_name:\r
-  default: localhost:3000
\ No newline at end of file
+  default: localhost:3000\r
+feeds_limit:\r
+  format: int\r
+  default: 15\r

diff --git a/lang/de.yml b/lang/de.yml
index 05ea437b6b20db5fb08a8a3d62a1ebcff4a6fd87..8c5bbf170310f273f0125349daae2bec9b98dcd1 100644 (file)
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -156,6 +156,7 @@ setting_mail_from: Emission address
 setting_host_name: Host Name\r
 setting_text_formatting: Textformatierung\r
 setting_wiki_compression: Wiki Geschichte Kompression\r
+setting_feeds_limit: Feed content limit\r
 \r
 label_user: Benutzer\r
 label_user_plural: Benutzer\r

diff --git a/lang/en.yml b/lang/en.yml
index 683c0ee7b6cf6634e0365512dbfdf557a32fecfd..b6ada109b2f972912878a10a32fffe7f8e7bbd69 100644 (file)
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -156,6 +156,7 @@ setting_mail_from: Emission mail address
 setting_host_name: Host name\r
 setting_text_formatting: Text formatting\r
 setting_wiki_compression: Wiki history compression\r
+setting_feeds_limit: Feed content limit\r
 \r
 label_user: User\r
 label_user_plural: Users\r

diff --git a/lang/es.yml b/lang/es.yml
index d455bcf72d21c9c4e3efe381bde66443881cca1b..337e5c753fa903282ed1ddcc472476597f3c0093 100644 (file)
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -156,6 +156,7 @@ setting_mail_from: Email de la emisión
 setting_host_name: Nombre de anfitrión\r
 setting_text_formatting: Formato de texto\r
 setting_wiki_compression: Compresión de la historia de Wiki\r
+setting_feeds_limit: Feed content limit\r
 \r
 label_user: Usuario\r
 label_user_plural: Usuarios\r

diff --git a/lang/fr.yml b/lang/fr.yml
index 83800e0a36825665b1e22e7d2b64a3ccac7fcbac..84995c83d68c56de1d9e9686b7c3b00e887840cf 100644 (file)
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -156,6 +156,7 @@ setting_mail_from: Adresse d'émission
 setting_host_name: Nom d'hôte\r
 setting_text_formatting: Formatage du texte\r
 setting_wiki_compression: Compression historique wiki\r
+setting_feeds_limit: Limite du contenu des flux RSS\r
 \r
 label_user: Utilisateur\r
 label_user_plural: Utilisateurs\r

diff --git a/lang/it.yml b/lang/it.yml
index 5bc88fb0a7eaca98b3751cce38497bee281b346d..47c623bcccfa089f12dadc8bcdc0a532886d1124 100644 (file)
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -156,6 +156,7 @@ setting_mail_from: Indirizzo sorgente e-mail
 setting_host_name: Nome host\r
 setting_text_formatting: Formattazione testo\r
 setting_wiki_compression: Compressione di storia di Wiki\r
+setting_feeds_limit: Feed content limit\r
 \r
 label_user: Utente\r
 label_user_plural: Utenti\r

diff --git a/lang/ja.yml b/lang/ja.yml
index 36272bcc70ff97409123375b216f5ab0f8b60f59..8466cf62f3d8c3e6e7545f8989fccaa225bf1d6f 100644 (file)
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -157,6 +157,7 @@ setting_mail_from: Emission メールアドレス
 setting_host_name: ホスト名\r
 setting_text_formatting: テキストの書式\r
 setting_wiki_compression: Wiki history compression\r
+setting_feeds_limit: Feed content limit\r
 \r
 label_user: ユーザ\r
 label_user_plural: ユーザ\r

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7fda16cd367bfdf58b1fa906e0510aac075d427a..20395a7a2d3e80fdb051a51f0b28f08fcd22d1b7 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -575,6 +575,8 @@ margin*/
 color: #cc0000;\r
 }\r
 \r
+#settings .tabular p{ padding-left: 250px; }\r
+#settings .tabular label{ margin-left: -250px; width: 245px; }\r
 \r
 /*.threepxfix class below:\r
 Targets IE6- ONLY. Adds 3 pixel indent for multi-line form contents.\r