jro_apps/redmine Commit - r10374:5a02dcf0a9f5

Fixed that issue notes preview is broken by r10547 (#1554)....

Jean-Philippe Lang -

r10374:5a02dcf0a9f5

parent child

Context file:

r10374:5a02dcf0a9f5

Collapse all files

app/controllers/previews_controller.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2012  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 PreviewsController < ApplicationController
               before_filter :find_project
               def issue
                 @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
                 if @issue
                   @attachements = @issue.attachments
                   @description = params[:issue] && params[:issue][:description]
                   if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
                     @description = nil
                   end
-                  @notes = params[:notes]
+                  @notes = (params[:issue] ? params[:issue][:notes] : nil)
                 else
                   @description = (params[:issue] ? params[:issue][:description] : nil)
                 end
                 render :layout => false
               end
               def news
                 if params[:id].present? && news = News.visible.find_by_id(params[:id])
                   @previewed = news
                   @attachments = news.attachments
                 end
                 @text = (params[:news] ? params[:news][:description] : nil)
                 render :partial => 'common/preview'
               end
               private
               def find_project
                 project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
                 @project = Project.find(project_id)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

test/functional/previews_controller_test.rb +2 -3

             # Redmine - project management software
             # Copyright (C) 2006-2012  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 PreviewsControllerTest < ActionController::TestCase
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :workflows,
                        :journals, :journal_details,
                        :news
               def test_preview_new_issue
                 @request.session[:user_id] = 2
                 post :issue, :project_id => '1', :issue => {:description => 'Foo'}
                 assert_response :success
                 assert_template 'preview'
                 assert_not_nil assigns(:description)
               end
               def test_preview_issue_notes
                 @request.session[:user_id] = 2
                 post :issue, :project_id => '1', :id => 1,
-                     :issue => {:description => Issue.find(1).description},
+                     :issue => {:description => Issue.find(1).description, :notes => 'Foo'}
-                     :notes => 'Foo'
                 assert_response :success
                 assert_template 'preview'
                 assert_not_nil assigns(:notes)
               end
               def test_preview_journal_notes_for_update
                 @request.session[:user_id] = 2
-                post :issue, :project_id => '1', :id => 1, :notes => 'Foo'
+                post :issue, :project_id => '1', :id => 1, :issue => {:notes => 'Foo'}
                 assert_response :success
                 assert_template 'preview'
                 assert_not_nil assigns(:notes)
                 assert_tag :p, :content => 'Foo'
               end
               def test_preview_new_news
                 get :news, :project_id => 1,
                               :news => {:title => '',
                                         :description => 'News description',
                                         :summary => ''}
                 assert_response :success
                 assert_template 'common/_preview'
                 assert_tag :tag => 'fieldset', :attributes => { :class => 'preview' },
                                                :content => /News description/
               end
               def test_existing_new_news
                 get :news, :project_id => 1, :id => 2,
                               :news => {:title => '',
                                         :description => 'News description',
                                         :summary => ''}
                 assert_response :success
                 assert_template 'common/_preview'
                 assert_equal News.find(2), assigns(:previewed)
                 assert_not_nil assigns(:attachments)
                 assert_tag :tag => 'fieldset', :attributes => { :class => 'preview' },
                                                :content => /News description/
               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