##// END OF EJS Templates
Fixed flawed regexp for removing pre blocks when quoting messages (#16353)....
Jean-Philippe Lang -
r12698:4e5bb0e23167
parent child
Show More
@@ -1,142 +1,142
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2014 Jean-Philippe Lang
2 # Copyright (C) 2006-2014 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 MessagesController < ApplicationController
18 class MessagesController < ApplicationController
19 menu_item :boards
19 menu_item :boards
20 default_search_scope :messages
20 default_search_scope :messages
21 before_filter :find_board, :only => [:new, :preview]
21 before_filter :find_board, :only => [:new, :preview]
22 before_filter :find_attachments, :only => [:preview]
22 before_filter :find_attachments, :only => [:preview]
23 before_filter :find_message, :except => [:new, :preview]
23 before_filter :find_message, :except => [:new, :preview]
24 before_filter :authorize, :except => [:preview, :edit, :destroy]
24 before_filter :authorize, :except => [:preview, :edit, :destroy]
25
25
26 helper :boards
26 helper :boards
27 helper :watchers
27 helper :watchers
28 helper :attachments
28 helper :attachments
29 include AttachmentsHelper
29 include AttachmentsHelper
30
30
31 REPLIES_PER_PAGE = 25 unless const_defined?(:REPLIES_PER_PAGE)
31 REPLIES_PER_PAGE = 25 unless const_defined?(:REPLIES_PER_PAGE)
32
32
33 # Show a topic and its replies
33 # Show a topic and its replies
34 def show
34 def show
35 page = params[:page]
35 page = params[:page]
36 # Find the page of the requested reply
36 # Find the page of the requested reply
37 if params[:r] && page.nil?
37 if params[:r] && page.nil?
38 offset = @topic.children.where("#{Message.table_name}.id < ?", params[:r].to_i).count
38 offset = @topic.children.where("#{Message.table_name}.id < ?", params[:r].to_i).count
39 page = 1 + offset / REPLIES_PER_PAGE
39 page = 1 + offset / REPLIES_PER_PAGE
40 end
40 end
41
41
42 @reply_count = @topic.children.count
42 @reply_count = @topic.children.count
43 @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
43 @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
44 @replies = @topic.children.
44 @replies = @topic.children.
45 includes(:author, :attachments, {:board => :project}).
45 includes(:author, :attachments, {:board => :project}).
46 reorder("#{Message.table_name}.created_on ASC").
46 reorder("#{Message.table_name}.created_on ASC").
47 limit(@reply_pages.per_page).
47 limit(@reply_pages.per_page).
48 offset(@reply_pages.offset).
48 offset(@reply_pages.offset).
49 all
49 all
50
50
51 @reply = Message.new(:subject => "RE: #{@message.subject}")
51 @reply = Message.new(:subject => "RE: #{@message.subject}")
52 render :action => "show", :layout => false if request.xhr?
52 render :action => "show", :layout => false if request.xhr?
53 end
53 end
54
54
55 # Create a new topic
55 # Create a new topic
56 def new
56 def new
57 @message = Message.new
57 @message = Message.new
58 @message.author = User.current
58 @message.author = User.current
59 @message.board = @board
59 @message.board = @board
60 @message.safe_attributes = params[:message]
60 @message.safe_attributes = params[:message]
61 if request.post?
61 if request.post?
62 @message.save_attachments(params[:attachments])
62 @message.save_attachments(params[:attachments])
63 if @message.save
63 if @message.save
64 call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
64 call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
65 render_attachment_warning_if_needed(@message)
65 render_attachment_warning_if_needed(@message)
66 redirect_to board_message_path(@board, @message)
66 redirect_to board_message_path(@board, @message)
67 end
67 end
68 end
68 end
69 end
69 end
70
70
71 # Reply to a topic
71 # Reply to a topic
72 def reply
72 def reply
73 @reply = Message.new
73 @reply = Message.new
74 @reply.author = User.current
74 @reply.author = User.current
75 @reply.board = @board
75 @reply.board = @board
76 @reply.safe_attributes = params[:reply]
76 @reply.safe_attributes = params[:reply]
77 @topic.children << @reply
77 @topic.children << @reply
78 if !@reply.new_record?
78 if !@reply.new_record?
79 call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
79 call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
80 attachments = Attachment.attach_files(@reply, params[:attachments])
80 attachments = Attachment.attach_files(@reply, params[:attachments])
81 render_attachment_warning_if_needed(@reply)
81 render_attachment_warning_if_needed(@reply)
82 end
82 end
83 redirect_to board_message_path(@board, @topic, :r => @reply)
83 redirect_to board_message_path(@board, @topic, :r => @reply)
84 end
84 end
85
85
86 # Edit a message
86 # Edit a message
87 def edit
87 def edit
88 (render_403; return false) unless @message.editable_by?(User.current)
88 (render_403; return false) unless @message.editable_by?(User.current)
89 @message.safe_attributes = params[:message]
89 @message.safe_attributes = params[:message]
90 if request.post? && @message.save
90 if request.post? && @message.save
91 attachments = Attachment.attach_files(@message, params[:attachments])
91 attachments = Attachment.attach_files(@message, params[:attachments])
92 render_attachment_warning_if_needed(@message)
92 render_attachment_warning_if_needed(@message)
93 flash[:notice] = l(:notice_successful_update)
93 flash[:notice] = l(:notice_successful_update)
94 @message.reload
94 @message.reload
95 redirect_to board_message_path(@message.board, @message.root, :r => (@message.parent_id && @message.id))
95 redirect_to board_message_path(@message.board, @message.root, :r => (@message.parent_id && @message.id))
96 end
96 end
97 end
97 end
98
98
99 # Delete a messages
99 # Delete a messages
100 def destroy
100 def destroy
101 (render_403; return false) unless @message.destroyable_by?(User.current)
101 (render_403; return false) unless @message.destroyable_by?(User.current)
102 r = @message.to_param
102 r = @message.to_param
103 @message.destroy
103 @message.destroy
104 if @message.parent
104 if @message.parent
105 redirect_to board_message_path(@board, @message.parent, :r => r)
105 redirect_to board_message_path(@board, @message.parent, :r => r)
106 else
106 else
107 redirect_to project_board_path(@project, @board)
107 redirect_to project_board_path(@project, @board)
108 end
108 end
109 end
109 end
110
110
111 def quote
111 def quote
112 @subject = @message.subject
112 @subject = @message.subject
113 @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
113 @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
114
114
115 @content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
115 @content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
116 @content << @message.content.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
116 @content << @message.content.to_s.strip.gsub(%r{<pre>(.*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
117 end
117 end
118
118
119 def preview
119 def preview
120 message = @board.messages.find_by_id(params[:id])
120 message = @board.messages.find_by_id(params[:id])
121 @text = (params[:message] || params[:reply])[:content]
121 @text = (params[:message] || params[:reply])[:content]
122 @previewed = message
122 @previewed = message
123 render :partial => 'common/preview'
123 render :partial => 'common/preview'
124 end
124 end
125
125
126 private
126 private
127 def find_message
127 def find_message
128 return unless find_board
128 return unless find_board
129 @message = @board.messages.includes(:parent).find(params[:id])
129 @message = @board.messages.includes(:parent).find(params[:id])
130 @topic = @message.root
130 @topic = @message.root
131 rescue ActiveRecord::RecordNotFound
131 rescue ActiveRecord::RecordNotFound
132 render_404
132 render_404
133 end
133 end
134
134
135 def find_board
135 def find_board
136 @board = Board.includes(:project).find(params[:board_id])
136 @board = Board.includes(:project).find(params[:board_id])
137 @project = @board.project
137 @project = @board.project
138 rescue ActiveRecord::RecordNotFound
138 rescue ActiveRecord::RecordNotFound
139 render_404
139 render_404
140 nil
140 nil
141 end
141 end
142 end
142 end
General Comments 0
You need to be logged in to leave comments. Login now