diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-12-10 20:09:41 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-12-10 20:09:41 +0000 |
| commit | ef25210aca9278e51f81bd15e85a3143c667ff17 (patch) | |
| tree | 312d20360571770a231f4fd307c12d0c535d60f2 /app/controllers/messages_controller.rb | |
| parent | 2304f5d42c2bb1829b1cf9055c2848db116742d3 (diff) | |
| download | redmine-ef25210aca9278e51f81bd15e85a3143c667ff17.tar.gz redmine-ef25210aca9278e51f81bd15e85a3143c667ff17.zip | |
Merged ajax_upload branch (#3957).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10977 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/messages_controller.rb')
| -rw-r--r-- | app/controllers/messages_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 16e3b7c45..82b74dda5 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -19,6 +19,7 @@ class MessagesController < ApplicationController menu_item :boards default_search_scope :messages before_filter :find_board, :only => [:new, :preview] + before_filter :find_attachments, :only => [:preview] before_filter :find_message, :except => [:new, :preview] before_filter :authorize, :except => [:preview, :edit, :destroy] @@ -117,7 +118,6 @@ class MessagesController < ApplicationController def preview message = @board.messages.find_by_id(params[:id]) - @attachements = message.attachments if message @text = (params[:message] || params[:reply])[:content] @previewed = message render :partial => 'common/preview' |