##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed that issue notes preview is broken by r10547 (#1554)....
Jean-Philippe Lang -
r10374:5a02dcf0a9f5
parent child
Show More
Side by Side Unified
Context file:
r10374:5a02dcf0a9f5 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,54 +1,54
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class PreviewsController < ApplicationController
19 19 before_filter :find_project
20 20
21 21 def issue
22 22 @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
23 23 if @issue
24 24 @attachements = @issue.attachments
25 25 @description = params[:issue] && params[:issue][:description]
26 26 if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
27 27 @description = nil
28 28 end
29 @notes = params[:notes]
29 @notes = (params[:issue] ? params[:issue][:notes] : nil)
30 30 else
31 31 @description = (params[:issue] ? params[:issue][:description] : nil)
32 32 end
33 33 render :layout => false
34 34 end
35 35
36 36 def news
37 37 if params[:id].present? && news = News.visible.find_by_id(params[:id])
38 38 @previewed = news
39 39 @attachments = news.attachments
40 40 end
41 41 @text = (params[:news] ? params[:news][:description] : nil)
42 42 render :partial => 'common/preview'
43 43 end
44 44
45 45 private
46 46
47 47 def find_project
48 48 project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
49 49 @project = Project.find(project_id)
50 50 rescue ActiveRecord::RecordNotFound
51 51 render_404
52 52 end
53 53
54 54 end
Show file before | Show file after | Hide comments
@@ -1,83 +1,82
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../test_helper', __FILE__)
19 19
20 20 class PreviewsControllerTest < ActionController::TestCase
21 21 fixtures :projects, :trackers, :issue_statuses, :issues,
22 22 :enumerations, :users, :issue_categories,
23 23 :projects_trackers,
24 24 :roles,
25 25 :member_roles,
26 26 :members,
27 27 :enabled_modules,
28 28 :workflows,
29 29 :journals, :journal_details,
30 30 :news
31 31
32 32 def test_preview_new_issue
33 33 @request.session[:user_id] = 2
34 34 post :issue, :project_id => '1', :issue => {:description => 'Foo'}
35 35 assert_response :success
36 36 assert_template 'preview'
37 37 assert_not_nil assigns(:description)
38 38 end
39 39
40 40 def test_preview_issue_notes
41 41 @request.session[:user_id] = 2
42 42 post :issue, :project_id => '1', :id => 1,
43 :issue => {:description => Issue.find(1).description},
44 :notes => 'Foo'
43 :issue => {:description => Issue.find(1).description, :notes => 'Foo'}
45 44 assert_response :success
46 45 assert_template 'preview'
47 46 assert_not_nil assigns(:notes)
48 47 end
49 48
50 49 def test_preview_journal_notes_for_update
51 50 @request.session[:user_id] = 2
52 post :issue, :project_id => '1', :id => 1, :notes => 'Foo'
51 post :issue, :project_id => '1', :id => 1, :issue => {:notes => 'Foo'}
53 52 assert_response :success
54 53 assert_template 'preview'
55 54 assert_not_nil assigns(:notes)
56 55 assert_tag :p, :content => 'Foo'
57 56 end
58 57
59 58 def test_preview_new_news
60 59 get :news, :project_id => 1,
61 60 :news => {:title => '',
62 61 :description => 'News description',
63 62 :summary => ''}
64 63 assert_response :success
65 64 assert_template 'common/_preview'
66 65 assert_tag :tag => 'fieldset', :attributes => { :class => 'preview' },
67 66 :content => /News description/
68 67 end
69 68
70 69 def test_existing_new_news
71 70 get :news, :project_id => 1, :id => 2,
72 71 :news => {:title => '',
73 72 :description => 'News description',
74 73 :summary => ''}
75 74 assert_response :success
76 75 assert_template 'common/_preview'
77 76 assert_equal News.find(2), assigns(:previewed)
78 77 assert_not_nil assigns(:attachments)
79 78
80 79 assert_tag :tag => 'fieldset', :attributes => { :class => 'preview' },
81 80 :content => /News description/
82 81 end
83 82 end
General Comments 0
You need to be logged in to leave comments. Login now