jro_apps/redmine Commit - r875:ad68a82be19f

app/controllers/news_controller.rb +24 -2

              class NewsController < ApplicationController
                layout 'base'
-               before_filter :find_project, :authorize
+               before_filter :find_project, :authorize, :except => :index
+               before_filter :find_optional_project, :only => :index
+               accept_key_auth :index
+               def index
+                 @news_pages, @newss = paginate :news,
+                                                :per_page => 10,
+                                                :conditions => (@project ? {:project_id => @project.id} : Project.visible_by(User.current)),
+                                                :include => [:author, :project],
+                                                :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 ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
+                 end
+               end
                def show
                end
                def destroy
                  @news.destroy
-                 redirect_to :controller => 'projects', :action => 'list_news', :id => @project
+                 redirect_to :action => 'index', :project_id => @project
                end
              private
                rescue ActiveRecord::RecordNotFound
                  render_404
-               end
+               def find_optional_project
+                 return true unless params[:project_id]
+                 @project = Project.find(params[:project_id])
+                 authorize
+               rescue ActiveRecord::RecordNotFound
+                 render_404
+               end
              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 +3 0

              <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 %>
+             		<%= 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 +15 -33

              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require File.dirname(__FILE__) + '/../test_helper'
-             require 'feeds_controller'
+             require 'news_controller'
              # Re-raise errors caught by the controller.
-             class FeedsController; def rescue_action(e) raise e end; end
+             class NewsController; def rescue_action(e) raise e end; end
-             class FeedsControllerTest < Test::Unit::TestCase
-               fixtures :projects, :users, :members, :roles
+             class NewsControllerTest < Test::Unit::TestCase
+               fixtures :projects, :users, :roles, :members, :enabled_modules
                def setup
-                 @controller = FeedsController.new
+                 @controller = NewsController.new
                  @request    = ActionController::TestRequest.new
                  @response   = ActionController::TestResponse.new
+                 User.current = nil
                end
-               def test_news
-                 get :news
+               def test_index
+                 get :index
                  assert_response :success
-                 assert_template 'news'
-                 assert_not_nil assigns(:news)
+                 assert_template 'index'
+                 assert_not_nil assigns(:newss)
+                 assert_nil assigns(:project)
                end
-               def test_issues
-                 get :issues
-                 assert_response :success
-                 assert_template 'issues'
-                 assert_not_nil assigns(:issues)
-               end
-               def test_history
-                 get :history
-                 assert_response :success
-                 assert_template 'history'
-                 assert_not_nil assigns(:journals)
-               end
-               def test_project_privacy
-                 get :news, :project_id => 2
-                 assert_response 403
-               end
-               def test_rss_key
-                 user = User.find(2)
-                 key = user.rss_key
-                 get :news, :project_id => 2, :key => key
+               def test_index_with_project
+                 get :index, :project_id => 1
                  assert_response :success
+                 assert_template 'index'
+                 assert_not_nil assigns(:newss)
                end
              end

test/functional/projects_controller_test.rb 0 -7

                  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
                  get :list_files, :id => 1
                  assert_response :success

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

	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