jro_apps/redmine Commit - r2590:a7e32302a6c9

Adds single forum atom feed (#3181)....

Jean-Philippe Lang -

r2590:a7e32302a6c9

parent child

Context file:

r2590:a7e32302a6c9

Collapse all files

app/controllers/boards_controller.rb +23 -13

@@ -35,19 +35,29 class BoardsController < ApplicationController
35	end	35	end
36		36
37	def show	37	def show
38	sort_init 'updated_on', 'desc'	38	respond_to do \|format\|
39	sort_update 'created_on' => "#{Message.table_name}.created_on",	39	format.html {
40	'replies' => "#{Message.table_name}.replies_count",	40	sort_init 'updated_on', 'desc'
41	~~'upd~~ated_on' => "#{Message.table_name}.~~upd~~ated_on"	41	sort_update 'created_on' => "#{Message.table_name}.created_on",
42		42	'replies' => "#{Message.table_name}.replies_count",
43	@topic_count = @board.topics.count	43	'updated_on' => "#{Message.table_name}.updated_on"
44	@topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']	44
45	@topics = @board.topics.find :all, :order => ["#{Message.table_name}.sticky DESC", sort_clause].compact.join(', '),	45	@topic_count = @board.topics.count
46	:include => [:author, {:last_reply => :author}],	46	@topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
47	:limit => @topic_pages.items_per_page,	47	@topics = @board.topics.find :all, :order => ["#{Message.table_name}.sticky DESC", sort_clause].compact.join(', '),
48	:offset => @topic_pages.current.offset	48	:include => [:author, {:last_reply => :author}],
49	@message = Message.new	49	:limit => @topic_pages.items_per_page,
50	render :action => 'show', :layout => !request.xhr?	50	:offset => @topic_pages.current.offset
		51	@message = Message.new
		52	render :action => 'show', :layout => !request.xhr?
		53	}
		54	format.atom {
		55	@messages = @board.messages.find :all, :order => 'created_on DESC',
		56	:include => [:author, :board],
		57	:limit => Setting.feeds_limit.to_i
		58	render_feed(@messages, :title => "#{@project}: #{@board}")
		59	}
		60	end
51	end	61	end
52		62
53	verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index }	63	verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index }

app/models/board.rb +4 0

               validates_length_of :name, :maximum => 30
               validates_length_of :description, :maximum => 255
+              def to_s
+                name
+              end
               def reset_counters!
                 self.class.reset_counters!(id)
               end

app/views/boards/show.rhtml +8 0

@@ -59,4 +59,12
59	<p class="nodata"><%= l(:label_no_data) %></p>	59	<p class="nodata"><%= l(:label_no_data) %></p>
60	<% end %>	60	<% end %>
61		61
		62	<% other_formats_links do \|f\| %>
		63	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
		64	<% end %>
		65
62	<% html_title h(@board.name) %>	66	<% html_title h(@board.name) %>
		67
		68	<% content_for :header_tags do %>
		69	<%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
		70	<% end %>

config/routes.rb +1 0

                   board_views.connect 'projects/:project_id/boards', :action => 'index'
                   board_views.connect 'projects/:project_id/boards/new', :action => 'new'
                   board_views.connect 'projects/:project_id/boards/:id', :action => 'show'
+                  board_views.connect 'projects/:project_id/boards/:id.:format', :action => 'show'
                   board_views.connect 'projects/:project_id/boards/:id/edit', :action => 'edit'
                 end
                 board_routes.with_options :conditions => {:method => :post} do |board_actions|

test/functional/boards_controller_test.rb +13 0

                   {:method => :get, :path => '/projects/world_domination/boards/44'},
                   :controller => 'boards', :action => 'show', :id => '44', :project_id => 'world_domination'
                 )
+                assert_routing(
+                  {:method => :get, :path => '/projects/world_domination/boards/44.atom'},
+                  :controller => 'boards', :action => 'show', :id => '44', :project_id => 'world_domination', :format => 'atom'
+                )
               end
               def test_show
                 assert_not_nil assigns(:topics)
               end
+              def test_show_atom
+                get :show, :project_id => 1, :id => 1, :format => 'atom'
+                assert_response :success
+                assert_template 'common/feed.atom'
+                assert_not_nil assigns(:board)
+                assert_not_nil assigns(:project)
+                assert_not_nil assigns(:messages)
+              end
               def test_edit_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/world_domination/boards/44/edit'},

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages