jro_apps/redmine Commit - r13213:46756cbd5646

Fixed 500 error when displaying a news with comments in reverse order (#18332)....

Jean-Philippe Lang -

r13213:46756cbd5646

parent child

Context file:

r13213:46756cbd5646

Collapse all files

app/controllers/news_controller.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class NewsController < ApplicationController
               default_search_scope :news
               model_object News
               before_filter :find_model_object, :except => [:new, :create, :index]
               before_filter :find_project_from_association, :except => [:new, :create, :index]
               before_filter :find_project_by_project_id, :only => [:new, :create]
               before_filter :authorize, :except => [:index]
               before_filter :find_optional_project, :only => :index
               accept_rss_auth :index
               accept_api_auth :index
               helper :watchers
               helper :attachments
               def index
                 case params[:format]
                 when 'xml', 'json'
                   @offset, @limit = api_offset_and_limit
                 else
                   @limit =  10
                 end
                 scope = @project ? @project.news.visible : News.visible
                 @news_count = scope.count
                 @news_pages = Paginator.new @news_count, @limit, params['page']
                 @offset ||= @news_pages.offset
                 @newss = scope.includes([:author, :project]).
                                   order("#{News.table_name}.created_on DESC").
                                   limit(@limit).
                                   offset(@offset).
                                   to_a
                 respond_to do |format|
                   format.html {
                     @news = News.new # for adding news inline
                     render :layout => false if request.xhr?
                   }
                   format.api
                   format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
                 end
               end
               def show
-                @comments = @news.comments
+                @comments = @news.comments.to_a
                 @comments.reverse! if User.current.wants_comments_in_reverse_order?
               end
               def new
                 @news = News.new(:project => @project, :author => User.current)
               end
               def create
                 @news = News.new(:project => @project, :author => User.current)
                 @news.safe_attributes = params[:news]
                 @news.save_attachments(params[:attachments])
                 if @news.save
                   render_attachment_warning_if_needed(@news)
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to project_news_index_path(@project)
                 else
                   render :action => 'new'
                 end
               end
               def edit
               end
               def update
                 @news.safe_attributes = params[:news]
                 @news.save_attachments(params[:attachments])
                 if @news.save
                   render_attachment_warning_if_needed(@news)
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to news_path(@news)
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 @news.destroy
                 redirect_to project_news_index_path(@project)
               end
               private
               def find_optional_project
                 return true unless params[:project_id]
                 @project = Project.find(params[:project_id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

test/functional/news_controller_test.rb +11 0

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class NewsControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles,
                        :enabled_modules, :news, :comments,
                        :attachments
               def setup
                 User.current = nil
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:newss)
                 assert_nil assigns(:project)
               end
               def test_index_with_project
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:newss)
               end
               def test_index_with_invalid_project_should_respond_with_404
                 get :index, :project_id => 999
                 assert_response 404
               end
               def test_show
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'h2', :content => /eCookbook first release/
               end
               def test_show_should_show_attachments
                 attachment = Attachment.first
                 attachment.container = News.find(1)
                 attachment.save!
                 get :show, :id => 1
                 assert_response :success
                 assert_tag 'a', :content => attachment.filename
               end
+              def test_show_with_comments_in_reverse_order
+                user = User.find(1)
+                user.pref[:comments_sorting] = 'desc'
+                user.pref.save!
+                @request.session[:user_id] = 1
+                get :show, :id => 1
+                assert_response :success
+                assert_equal News.find(1).comments.to_a.sort_by(&:created_on).reverse, assigns(:comments)
+              end
               def test_show_not_found
                 get :show, :id => 999
                 assert_response 404
               end
               def test_get_new
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
               end
               def test_post_create
                 ActionMailer::Base.deliveries.clear
                 @request.session[:user_id] = 2
                 with_settings :notified_events => %w(news_added) do
                   post :create, :project_id => 1, :news => { :title => 'NewsControllerTest',
                                                         :description => 'This is the description',
                                                         :summary => '' }
                 end
                 assert_redirected_to '/projects/ecookbook/news'
                 news = News.find_by_title('NewsControllerTest')
                 assert_not_nil news
                 assert_equal 'This is the description', news.description
                 assert_equal User.find(2), news.author
                 assert_equal Project.find(1), news.project
                 assert_equal 1, ActionMailer::Base.deliveries.size
               end
               def test_post_create_with_attachment
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 assert_difference 'News.count' do
                   assert_difference 'Attachment.count' do
                     post :create, :project_id => 1,
                       :news => { :title => 'Test', :description => 'This is the description' },
                       :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                   end
                 end
                 attachment = Attachment.order('id DESC').first
                 news = News.order('id DESC').first
                 assert_equal news, attachment.container
               end
               def test_post_create_with_validation_failure
                 @request.session[:user_id] = 2
                 post :create, :project_id => 1, :news => { :title => '',
                                                         :description => 'This is the description',
                                                         :summary => '' }
                 assert_response :success
                 assert_template 'new'
                 assert_not_nil assigns(:news)
                 assert assigns(:news).new_record?
                 assert_error_tag :content => /title #{ESCAPED_CANT} be blank/i
               end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
               end
               def test_put_update
                 @request.session[:user_id] = 2
                 put :update, :id => 1, :news => { :description => 'Description changed by test_post_edit' }
                 assert_redirected_to '/news/1'
                 news = News.find(1)
                 assert_equal 'Description changed by test_post_edit', news.description
               end
               def test_put_update_with_attachment
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 assert_no_difference 'News.count' do
                   assert_difference 'Attachment.count' do
                     put :update, :id => 1,
                       :news => { :description => 'This is the description' },
                       :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                   end
                 end
                 attachment = Attachment.order('id DESC').first
                 assert_equal News.find(1), attachment.container
               end
               def test_update_with_failure
                 @request.session[:user_id] = 2
                 put :update, :id => 1, :news => { :description => '' }
                 assert_response :success
                 assert_template 'edit'
                 assert_error_tag :content => /description #{ESCAPED_CANT} be blank/i
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 delete :destroy, :id => 1
                 assert_redirected_to '/projects/ecookbook/news'
                 assert_nil News.find_by_id(1)
               end
             end

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