jro_apps/redmine Commit - r910:7704e2d9191d

Forums: attachments can now be added to replies....

Jean-Philippe Lang -

r910:7704e2d9191d

parent child

Context file:

r910:7704e2d9191d

Collapse all files

app/controllers/messages_controller.rb +6 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class MessagesController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize
               verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
               helper :attachments
               include AttachmentsHelper
               def show
                 @reply = Message.new(:subject => "RE: #{@message.subject}")
                 render :action => "show", :layout => false if request.xhr?
               end
               def new
                 @message = Message.new(params[:message])
                 @message.author = User.current
                 @message.board = @board
                 if request.post? && @message.save
                   params[:attachments].each { |file|
-                    next unless file.size > 0
+                    Attachment.create(:container => @message, :file => file, :author => User.current) if file.size > 0
-                    Attachment.create(:container => @message, :file => file, :author => User.current)
                   } if params[:attachments] and params[:attachments].is_a? Array
                   redirect_to :action => 'show', :id => @message
                 end
               end
               def reply
                 @reply = Message.new(params[:reply])
                 @reply.author = User.current
                 @reply.board = @board
                 @message.children << @reply
+                if !@reply.new_record?
+                  params[:attachments].each { |file|
+                    Attachment.create(:container => @reply, :file => file, :author => User.current) if file.size > 0
+                  } if params[:attachments] and params[:attachments].is_a? Array
+                end
                 redirect_to :action => 'show', :id => @message
               end
             private
               def find_project
                 @board = Board.find(params[:board_id], :include => :project)
                 @project = @board.project
                 @message = @board.topics.find(params[:id]) if params[:id]
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/views/messages/_form.rhtml +2 -1

             <%= error_messages_for 'message' %>
             <div class="box">
             <!--[form:message]-->
             <p><label><%= l(:field_subject) %></label><br />
             <%= f.text_field :subject, :required => true, :size => 120 %></p>
-            <p><%= f.text_area :content, :required => true, :cols => 80, :rows => 15, :class => 'wiki-edit' %></p>
+            <p><%= f.text_area :content, :required => true, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content' %></p>
             <%= wikitoolbar_for 'message_content' %>
             <!--[eoform:message]-->
             <span class="tabular">
             <%= render :partial => 'attachments/form' %>
+            </span>
             </div>

app/views/messages/show.rhtml +10 -7

             <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @message.subject %></h2>
+            <div class="message">
             <p><span class="author"><%= authoring @message.created_on, @message.author %></span></p>
             <div class="wiki">
             <%= textilizable(@message.content, :attachments => @message.attachments) %>
             </div>
             <%= link_to_attachments @message.attachments, :no_author => true %>
+            </div>
             <br />
+            <div class="message reply">
             <h3 class="icon22 icon22-comment"><%= l(:label_reply_plural) %></h3>
             <% @message.children.each do |message| %>
               <a name="<%= "message-#{message.id}" %>"></a>
-              <h4><%=h message.subject %> - <%= message.author.name %>, <%= format_time(message.created_on) %></h4>
+              <h4><%=h message.subject %> - <%= authoring message.created_on, message.author %></h4>
               <div class="wiki"><%= textilizable message.content %></div>
+              <%= link_to_attachments message.attachments, :no_author => true %>
             <% end %>
+            </div>
             <% if authorize_for('messages', 'reply') %>
-            <p><%= toggle_link l(:button_reply), "reply", :focus => "reply_content" %></p>
+            <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
             <div id="reply" style="display:none;">
-            <%= error_messages_for 'message' %>
+            <% form_for :reply, @reply, :url => {:action => 'reply', :id => @message}, :html => {:multipart => true} do |f| %>
-            <% form_for :reply, @reply, :url => {:action => 'reply', :id => @message} do |f| %>
+                <%= render :partial => 'form', :locals => {:f => f} %>
-              <p><%= f.text_field :subject, :required => true, :size => 60 %></p>
+                <%= submit_tag l(:button_submit) %>
-              <p><%= f.text_area :content, :required => true, :cols => 80, :rows => 10 %></p>
-              <p><%= submit_tag l(:button_submit) %></p>
             <% end %>
             </div>
             <% end %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages