##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r10975 from trunk (#12566)....
Jean-Philippe Lang -
r10772:ca0b289479be
parent child
Show More
Side by Side Unified
Context file:
r10772:ca0b289479be Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,50 +1,51
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2012 Jean-Philippe Lang
2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 class PreviewsController < ApplicationController
18 class PreviewsController < ApplicationController
19 before_filter :find_project
19 before_filter :find_project
20
20
21 def issue
21 def issue
22 @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
22 @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
23 if @issue
23 if @issue
24 @attachements = @issue.attachments
24 @attachements = @issue.attachments
25 @description = params[:issue] && params[:issue][:description]
25 @description = params[:issue] && params[:issue][:description]
26 if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
26 if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
27 @description = nil
27 @description = nil
28 end
28 end
29 @notes = params[:notes]
29 # params[:notes] is useful for preview of notes in issue history
30 @notes = params[:notes] || (params[:issue] ? params[:issue][:notes] : nil)
30 else
31 else
31 @description = (params[:issue] ? params[:issue][:description] : nil)
32 @description = (params[:issue] ? params[:issue][:description] : nil)
32 end
33 end
33 render :layout => false
34 render :layout => false
34 end
35 end
35
36
36 def news
37 def news
37 @text = (params[:news] ? params[:news][:description] : nil)
38 @text = (params[:news] ? params[:news][:description] : nil)
38 render :partial => 'common/preview'
39 render :partial => 'common/preview'
39 end
40 end
40
41
41 private
42 private
42
43
43 def find_project
44 def find_project
44 project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
45 project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
45 @project = Project.find(project_id)
46 @project = Project.find(project_id)
46 rescue ActiveRecord::RecordNotFound
47 rescue ActiveRecord::RecordNotFound
47 render_404
48 render_404
48 end
49 end
49
50
50 end
51 end
General Comments 0
You need to be logged in to leave comments. Login now