Index: app/controllers/news_controller.rb =================================================================== --- app/controllers/news_controller.rb (revision 3892) +++ app/controllers/news_controller.rb (working copy) @@ -26,9 +26,10 @@ accept_key_auth :index def index + @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1') @news_pages, @newss = paginate :news, :per_page => 10, - :conditions => Project.allowed_to_condition(User.current, :view_news, :project => @project), + :conditions => Project.allowed_to_condition(User.current, :view_news, :project => @project, :with_subprojects => @with_subprojects), :include => [:author, :project], :order => "#{News.table_name}.created_on DESC" respond_to do |format| Index: app/views/news/index.rhtml =================================================================== --- app/views/news/index.rhtml (revision 3892) +++ app/views/news/index.rhtml (working copy) @@ -43,6 +43,17 @@ <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %> <% end %> +<% content_for :sidebar do %> + <% form_tag({:project_id => @project}, :method => :get) do %> +

<%= l(:label_news) %>

+ <% if @project.descendants.active.any? %> + <%= hidden_field_tag 'with_subprojects', 0 %> +
+ <% end %> +

<%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %>

+ <% end %> +<% end if @project %> + <% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> <% end %>