| @@ -1,53 +1,53 | |||
|
|
1 | 1 | # Redmine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2014 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, :find_attachments |
|
|
20 | 20 | |
|
|
21 | 21 | def issue |
|
|
22 |
@issue = |
|
|
|
22 | @issue = Issue.visible.find_by_id(params[:id]) unless params[:id].blank? | |
|
|
23 | 23 | if @issue |
|
|
24 | 24 | @description = params[:issue] && params[:issue][:description] |
|
|
25 | 25 | if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n") |
|
|
26 | 26 | @description = nil |
|
|
27 | 27 | end |
|
|
28 | 28 | # params[:notes] is useful for preview of notes in issue history |
|
|
29 | 29 | @notes = params[: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 | end |
|
|
40 | 40 | @text = (params[:news] ? params[:news][:description] : nil) |
|
|
41 | 41 | render :partial => 'common/preview' |
|
|
42 | 42 | end |
|
|
43 | 43 | |
|
|
44 | 44 | private |
|
|
45 | 45 | |
|
|
46 | 46 | def find_project |
|
|
47 | 47 | project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id] |
|
|
48 | @project = Project.find(project_id) | |
|
|
48 | @project = Project.visible.find(project_id) | |
|
|
49 | 49 | rescue ActiveRecord::RecordNotFound |
|
|
50 | 50 | render_404 |
|
|
51 | 51 | end |
|
|
52 | 52 | |
|
|
53 | 53 | end |
| @@ -1,89 +1,97 | |||
|
|
1 | 1 | # Redmine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2014 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 | :journals, :journal_details, |
|
|
29 | 29 | :news |
|
|
30 | 30 | |
|
|
31 | 31 | def test_preview_new_issue |
|
|
32 | 32 | @request.session[:user_id] = 2 |
|
|
33 | 33 | post :issue, :project_id => '1', :issue => {:description => 'Foo'} |
|
|
34 | 34 | assert_response :success |
|
|
35 | 35 | assert_template 'previews/issue' |
|
|
36 | 36 | assert_not_nil assigns(:description) |
|
|
37 | 37 | end |
|
|
38 | 38 | |
|
|
39 | 39 | def test_preview_issue_notes |
|
|
40 | 40 | @request.session[:user_id] = 2 |
|
|
41 | 41 | post :issue, :project_id => '1', :id => 1, |
|
|
42 | 42 | :issue => {:description => Issue.find(1).description, :notes => 'Foo'} |
|
|
43 | 43 | assert_response :success |
|
|
44 | 44 | assert_template 'previews/issue' |
|
|
45 | 45 | assert_not_nil assigns(:notes) |
|
|
46 | 46 | end |
|
|
47 | 47 | |
|
|
48 | 48 | def test_preview_journal_notes_for_update |
|
|
49 | 49 | @request.session[:user_id] = 2 |
|
|
50 | 50 | post :issue, :project_id => '1', :id => 1, :notes => 'Foo' |
|
|
51 | 51 | assert_response :success |
|
|
52 | 52 | assert_template 'previews/issue' |
|
|
53 | 53 | assert_not_nil assigns(:notes) |
|
|
54 | 54 | assert_tag :p, :content => 'Foo' |
|
|
55 | 55 | end |
|
|
56 | 56 | |
|
|
57 | 57 | def test_preview_issue_notes_should_support_links_to_existing_attachments |
|
|
58 | 58 | Attachment.generate!(:container => Issue.find(1), :filename => 'foo.bar') |
|
|
59 | 59 | @request.session[:user_id] = 2 |
|
|
60 | 60 | post :issue, :project_id => '1', :id => 1, :notes => 'attachment:foo.bar' |
|
|
61 | 61 | assert_response :success |
|
|
62 | 62 | assert_select 'a.attachment', :text => 'foo.bar' |
|
|
63 | 63 | end |
|
|
64 | 64 | |
|
|
65 | def test_preview_issue_with_project_changed | |
|
|
66 | @request.session[:user_id] = 2 | |
|
|
67 | post :issue, :project_id => '1', :id => 1, :issue => {:notes => 'notes', :project_id => 2} | |
|
|
68 | assert_response :success | |
|
|
69 | assert_not_nil assigns(:issue) | |
|
|
70 | assert_not_nil assigns(:notes) | |
|
|
71 | end | |
|
|
72 | ||
|
|
65 | 73 | def test_preview_new_news |
|
|
66 | 74 | get :news, :project_id => 1, |
|
|
67 | 75 | :news => {:title => '', |
|
|
68 | 76 | :description => 'News description', |
|
|
69 | 77 | :summary => ''} |
|
|
70 | 78 | assert_response :success |
|
|
71 | 79 | assert_template 'common/_preview' |
|
|
72 | 80 | assert_tag :tag => 'fieldset', :attributes => { :class => 'preview' }, |
|
|
73 | 81 | :content => /News description/ |
|
|
74 | 82 | end |
|
|
75 | 83 | |
|
|
76 | 84 | def test_existing_new_news |
|
|
77 | 85 | get :news, :project_id => 1, :id => 2, |
|
|
78 | 86 | :news => {:title => '', |
|
|
79 | 87 | :description => 'News description', |
|
|
80 | 88 | :summary => ''} |
|
|
81 | 89 | assert_response :success |
|
|
82 | 90 | assert_template 'common/_preview' |
|
|
83 | 91 | assert_equal News.find(2), assigns(:previewed) |
|
|
84 | 92 | assert_not_nil assigns(:attachments) |
|
|
85 | 93 | |
|
|
86 | 94 | assert_tag :tag => 'fieldset', :attributes => { :class => 'preview' }, |
|
|
87 | 95 | :content => /News description/ |
|
|
88 | 96 | end |
|
|
89 | 97 | end |
General Comments 0
You need to be logged in to leave comments.
Login now