jro_apps/redmine Commit - r875:ad68a82be19f

Moved ProjectsController#list_news to NewsController#index....

Jean-Philippe Lang -

r875:ad68a82be19f

parent child

Context file:

r875:ad68a82be19f

Collapse all files

app/controllers/news_controller.rb +26 -4

@@ -17,8 +17,22
17		17
18	class NewsController < ApplicationController	18	class NewsController < ApplicationController
19	layout 'base'	19	layout 'base'
20	before_filter :find_project, :authorize	20	before_filter :find_project, :authorize, :except => :index
21		21	before_filter :find_optional_project, :only => :index
		22	accept_key_auth :index
		23
		24	def index
		25	@news_pages, @newss = paginate :news,
		26	:per_page => 10,
		27	:conditions => (@project ? {:project_id => @project.id} : Project.visible_by(User.current)),
		28	:include => [:author, :project],
		29	:order => "#{News.table_name}.created_on DESC"
		30	respond_to do \|format\|
		31	format.html { render :layout => false if request.xhr? }
		32	format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
		33	end
		34	end
		35
22	def show	36	def show
23	end	37	end
24		38
@@ -47,7 +61,7 class NewsController < ApplicationController
47		61
48	def destroy	62	def destroy
49	@news.destroy	63	@news.destroy
50	redirect_to ~~:controller~~ => ~~'projects'~~, :action => '~~list_news~~', :id => @project	64	redirect_to :action => 'index', :project_id => @project
51	end	65	end
52		66
53	private	67	private
@@ -56,5 +70,13 private
56	@project = @news.project	70	@project = @news.project
57	rescue ActiveRecord::RecordNotFound	71	rescue ActiveRecord::RecordNotFound
58	render_404	72	render_404
59	end	73	end
		74
		75	def find_optional_project
		76	return true unless params[:project_id]
		77	@project = Project.find(params[:project_id])
		78	authorize
		79	rescue ActiveRecord::RecordNotFound
		80	render_404
		81	end
60	end	82	end

app/controllers/projects_controller.rb +1 -11

                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
-                    redirect_to :action => 'list_news', :id => @project
+                    redirect_to :controller => 'news', :action => 'index', :project_id => @project
                   end
                 end
               end
-              # Show news list of @project
-              def list_news
-                @news_pages, @newss = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "#{News.table_name}.created_on DESC"
-                respond_to do |format|
-                  format.html { render :layout => false if request.xhr? }
-                  format.atom { render_feed(@newss, :title => "#{@project.name}: #{l(:label_news_plural)}") }
-                end
-              end
               def add_file
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])

app/views/news/index.rhtml ~~app/views/projects/list_news.rhtml~~ renamed +6 -5

             <div class="contextual">
-            <%= link_to_if_authorized l(:label_news_new),
+            <%= link_to_if_authorized(l(:label_news_new),
                                       {:controller => 'projects', :action => 'add_news', :id => @project},
                                       :class => 'icon icon-add',
-                                      :onclick => 'Element.show("add-news"); return false;' %>
+                                      :onclick => 'Element.show("add-news"); return false;') if @project %>
             </div>
             <div id="add-news" style="display:none;">
             <h2><%=l(:label_news_new)%></h2>
-            <% labelled_tabular_form_for :news, @news, :url => { :action => "add_news", :id => @project } do |f| %>
+            <% labelled_tabular_form_for :news, @news, :url => { :controller => 'projects', :action => "add_news", :id => @project } do |f| %>
             <%= render :partial => 'news/form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %>
-            <% end %>
+            <% end if @project %>
             </div>
             <h2><%=l(:label_news_plural)%></h2>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <% @newss.each do |news| %>
-                <h3><%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
+                <h3><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless news.project == @project %>
+                <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
                 <%= "(#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase})" if news.comments_count > 0 %></h3>
                 <p class="author"><%= authoring news.created_on, news.author %></p>
                 <%= textilizable(news.description) %>

app/views/projects/show.rhtml +2 -2

             	</div>
             	<% end %>
-              <% if @news.any? && authorize_for('projects', 'list_news') %>
+              <% if @news.any? && authorize_for('news', 'index') %>
               <div class="box">
                 <h3><%=l(:label_news_latest)%></h3>
                 <%= render :partial => 'news/news', :collection => @news %>
-                <p><%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %></p>
+                <p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p>
               </div>
               <% end %>
             </div>

app/views/welcome/index.rhtml +4 -1

             <div class="splitcontentleft">
               <%= textilizable Setting.welcome_text %>
+              <% if @news.any? %>
               <div class="box">
             	<h3><%=l(:label_news_latest)%></h3>
             		<%= render :partial => 'news/news', :collection => @news %>
-            	</div>
+            		<%= link_to l(:label_issue_view_all), :controller => 'news' %>
+              </div>
+              <% end %>
             </div>
             <div class="splitcontentright">

config/routes.rb +1 0

               map.connect 'issues/:issue_id/relations/:action/:id', :controller => 'issue_relations'
               map.connect 'projects/:project_id/issues/:action', :controller => 'issues'
+              map.connect 'projects/:project_id/news/:action', :controller => 'news'
               map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
               map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'

lib/redmine.rb +2 -2

               map.project_module :news do |map|
                 map.permission :manage_news, {:projects => :add_news, :news => [:edit, :destroy, :destroy_comment]}, :require => :member
-                map.permission :view_news, {:projects => :list_news, :news => :show}, :public => true
+                map.permission :view_news, {:news => [:index, :show]}, :public => true
                 map.permission :comment_news, {:news => :add_comment}, :require => :loggedin
               end
               menu.push :label_activity, :controller => 'projects', :action => 'activity'
               menu.push :label_roadmap, :controller => 'projects', :action => 'roadmap'
               menu.push :label_issue_plural, { :controller => 'issues', :action => 'index' }, :param => :project_id
-              menu.push :label_news_plural, :controller => 'projects', :action => 'list_news'
+              menu.push :label_news_plural, { :controller => 'news', :action => 'index' }, :param => :project_id
               menu.push :label_document_plural, :controller => 'projects', :action => 'list_documents'
               menu.push :label_wiki, { :controller => 'wiki', :action => 'index', :page => nil }, :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
               menu.push :label_board_plural, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, :if => Proc.new { |p| p.boards.any? }

test/functional/news_controller_test.rb ~~test/functional/feeds_controller_test.rb~~ renamed +17 -35

@@ -16,51 +16,33
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	require File.dirname(__FILE__) + '/../test_helper'	18	require File.dirname(__FILE__) + '/../test_helper'
19	require '~~feed~~s_controller'	19	require 'news_controller'
20		20
21	# Re-raise errors caught by the controller.	21	# Re-raise errors caught by the controller.
22	class ~~Feed~~sController; def rescue_action(e) raise e end; end	22	class NewsController; def rescue_action(e) raise e end; end
23
24	class FeedsControllerTest < Test::Unit::TestCase
25	fixtures :projects, :users, :members, :roles
26		23
		24	class NewsControllerTest < Test::Unit::TestCase
		25	fixtures :projects, :users, :roles, :members, :enabled_modules
		26
27	def setup	27	def setup
28	@controller = ~~Feed~~sController.new	28	@controller = NewsController.new
29	@request = ActionController::TestRequest.new	29	@request = ActionController::TestRequest.new
30	@response = ActionController::TestResponse.new	30	@response = ActionController::TestResponse.new
31	end	31	User.current = nil
32
33	def test_news
34	get :news
35	assert_response :success
36	assert_template 'news'
37	assert_not_nil assigns(:news)
38	end
39
40	def test_issues
41	get :issues
42	assert_response :success
43	assert_template 'issues'
44	assert_not_nil assigns(:issues)
45	end	32	end
46		33
47	def test_~~history~~	34	def test_index
48	get :~~history~~	35	get :index
49	assert_response :success	36	assert_response :success
50	assert_template '~~history~~'	37	assert_template 'index'
51	assert_not_nil assigns(:~~journal~~s)	38	assert_not_nil assigns(:newss)
52	end	39	assert_nil assigns(:project)
53
54	def test_project_privacy
55	get :news, :project_id => 2
56	assert_response 403
57	end	40	end
58		41
59	def test_rss_key	42	def test_index_with_project
60	user = User.find(2)	43	get :index, :project_id => 1
61	key = user.rss_key
62
63	get :news, :project_id => 2, :key => key
64	assert_response :success	44	assert_response :success
		45	assert_template 'index'
		46	assert_not_nil assigns(:newss)
65	end	47	end
66	end	48	end

test/functional/projects_controller_test.rb 0 -7

                 # check that the issues were updated
                 assert_equal [7, 7], Issue.find_all_by_id([1, 2]).collect {|i| i.priority.id}
                 assert_equal 'Bulk editing', Issue.find(1).journals.find(:first, :order => 'created_on DESC').notes
-              end
-              def test_list_news
-                get :list_news, :id => 1
-                assert_response :success
-                assert_template 'list_news'
-                assert_not_nil assigns(:newss)
               end
               def test_list_files

app/controllers/feeds_controller.rb removed 0 -98

NO CONTENT: file was removed

app/helpers/feeds_helper.rb removed 0 -19

NO CONTENT: file was removed

app/views/feeds/history.rxml removed 0 -28

NO CONTENT: file was removed

app/views/feeds/history_atom.rxml removed 0 -28

NO CONTENT: file was removed

app/views/feeds/issues.rxml removed 0 -20

NO CONTENT: file was removed

app/views/feeds/issues_atom.rxml removed 0 -22

NO CONTENT: file was removed

app/views/feeds/news.rxml removed 0 -20

NO CONTENT: file was removed

app/views/feeds/news_atom.rxml removed 0 -22

NO CONTENT: file was removed

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