jro_apps/redmine Commit - r422:3f87f3c47a26

Feature 9867 Allow file upload in comment and add to issue history...

Jean-Philippe Lang -

r422:3f87f3c47a26

parent child

Context file:

r422:3f87f3c47a26

Collapse all files

app/controllers/issues_controller.rb +21 -1

             # 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 IssuesController < ApplicationController
               layout 'base', :except => :export_pdf
               before_filter :find_project, :authorize
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               def show
                 @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
                 @journals_count = @issue.journals.count
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :limit => 15, :order => "#{Journal.table_name}.created_on desc")
               end
               def history
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on desc")
                 @journals_count = @journals.length
               end
               def export_pdf
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
                 @options_for_rfpdf ||= {}
                 @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.long_id}.pdf"
               end
               def edit
                 @priorities = Enumeration::get_values('IPRI')
                 if request.get?
                   @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   begin
                     @issue.init_journal(self.logged_in_user)
                     # Retrieve custom fields and values
                     @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                     @issue.custom_values = @custom_values
                     @issue.attributes = params[:issue]
                     if @issue.save
                       flash[:notice] = l(:notice_successful_update)
                       redirect_to :action => 'show', :id => @issue
                     end
                   rescue ActiveRecord::StaleObjectError
                     # Optimistic locking exception
                     flash[:notice] = l(:notice_locking_conflict)
                   end
                 end
               end
               def add_note
                 unless params[:notes].empty?
                   journal = @issue.init_journal(self.logged_in_user, params[:notes])
                   if @issue.save
                     flash[:notice] = l(:notice_successful_update)
                     Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                     redirect_to :action => 'show', :id => @issue
                     return
                   end
                 end
                 show
                 render :action => 'show'
               end
               def change_status
                 @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
                 @new_status = IssueStatus.find(params[:new_status_id])
                 if params[:confirm]
                   begin
                     journal = @issue.init_journal(self.logged_in_user, params[:notes])
                     @issue.status = @new_status
                     if @issue.update_attributes(params[:issue])
+                      # Save attachments
+                      params[:attachments].each { |file|
+                        next unless file.size > 0
+                        a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)
+                        journal.details << JournalDetail.new(:property => 'attachment',
+                                                             :prop_key => a.id,
+                                                             :value => a.filename) unless a.new_record?
+                      } if params[:attachments] and params[:attachments].is_a? Array
                       flash[:notice] = l(:notice_successful_update)
                       Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                       redirect_to :action => 'show', :id => @issue
                     end
                   rescue ActiveRecord::StaleObjectError
                     # Optimistic locking exception
                     flash[:notice] = l(:notice_locking_conflict)
                   end
                 end
                 @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
               end
               def destroy
                 @issue.destroy
                 redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
               end
               def add_attachment
                 # Save the attachments
                 @attachments = []
+                journal = @issue.init_journal(self.logged_in_user)
                 params[:attachments].each { |file|
                   next unless file.size > 0
                   a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)
                   @attachments << a unless a.new_record?
+                  journal.details << JournalDetail.new(:property => 'attachment',
+                                                       :prop_key => a.id,
+                                                       :value => a.filename) unless a.new_record?
                 } if params[:attachments] and params[:attachments].is_a? Array
+                journal.save if journal.details.any?
                 Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                 redirect_to :action => 'show', :id => @issue
               end
               def destroy_attachment
-                @issue.attachments.find(params[:attachment_id]).destroy
+                a = @issue.attachments.find(params[:attachment_id])
+                a.destroy
+                journal = @issue.init_journal(self.logged_in_user)
+                journal.details << JournalDetail.new(:property => 'attachment',
+                                                     :prop_key => a.id,
+                                                     :old_value => a.filename)
+                journal.save
                 redirect_to :action => 'show', :id => @issue
               end
               # Send the file in stream mode
               def download
                 @attachment = @issue.attachments.find(params[:attachment_id])
                 send_file @attachment.diskfile, :filename => @attachment.filename
               rescue
                 render_404
               end
             private
               def find_project
                 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                 @project = @issue.project
                 @html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}"
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/helpers/issues_helper.rb +17 -5

             # redMine - project management software
             # Copyright (C) 2006  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.
             module IssuesHelper
               def show_detail(detail, no_html=false)
                 case detail.property
                 when 'attr'
                   label = l(("field_" + detail.prop_key.to_s.gsub(/\_id$/, "")).to_sym)
                   case detail.prop_key
                   when 'due_date', 'start_date'
                     value = format_date(detail.value.to_date) if detail.value
                     old_value = format_date(detail.old_value.to_date) if detail.old_value
                   when 'status_id'
                     s = IssueStatus.find_by_id(detail.value) and value = s.name if detail.value
                     s = IssueStatus.find_by_id(detail.old_value) and old_value = s.name if detail.old_value
                   when 'assigned_to_id'
                     u = User.find_by_id(detail.value) and value = u.name if detail.value
                     u = User.find_by_id(detail.old_value) and old_value = u.name if detail.old_value
                   when 'priority_id'
                     e = Enumeration.find_by_id(detail.value) and value = e.name if detail.value
                     e = Enumeration.find_by_id(detail.old_value) and old_value = e.name if detail.old_value
                   when 'category_id'
                     c = IssueCategory.find_by_id(detail.value) and value = c.name if detail.value
                     c = IssueCategory.find_by_id(detail.old_value) and old_value = c.name if detail.old_value
                   when 'fixed_version_id'
                     v = Version.find_by_id(detail.value) and value = v.name if detail.value
                     v = Version.find_by_id(detail.old_value) and old_value = v.name if detail.old_value
                   end
                 when 'cf'
                   custom_field = CustomField.find_by_id(detail.prop_key)
                   if custom_field
                     label = custom_field.name
                     value = format_value(detail.value, custom_field.field_format) if detail.value
                     old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value
                   end
+                when 'attachment'
+                  label = l(:label_attachment)
                 end
                 label ||= detail.prop_key
                 value ||= detail.value
                 old_value ||= detail.old_value
                 unless no_html
                   label = content_tag('strong', label)
                   old_value = content_tag("i", h(old_value)) if detail.old_value
                   old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
                   value = content_tag("i", h(value)) if value
                 end
                 if detail.value and !detail.value.to_s.empty?
-                  if old_value
+                  case detail.property
-                    label + " " + l(:text_journal_changed, old_value, value)
+                  when 'attr', 'cf'
-                  else
+                    if old_value
-                    label + " " + l(:text_journal_set_to, value)
+                      label + " " + l(:text_journal_changed, old_value, value)
+                    else
+                      label + " " + l(:text_journal_set_to, value)
+                    end
+                  when 'attachment'
+                    "#{label} #{value} #{l(:label_added)}"
                   end
                 else
-                  label + " " + l(:text_journal_deleted) + " (#{old_value})"
+                  case detail.property
+                  when 'attr', 'cf'
+                    label + " " + l(:text_journal_deleted) + " (#{old_value})"
+                  when 'attachment'
+                    "#{label} #{old_value} #{l(:label_deleted)}"
+                  end
                 end
               end
             end

app/views/issues/change_status.rhtml +7 -1

             <h2><%=l(:label_issue)%> #<%= @issue.id %>: <%=h @issue.subject %></h2>
             <%= error_messages_for 'issue' %>
-            <% form_tag({:action => 'change_status', :id => @issue}, :class => "tabular") do %>
+            <% form_tag({:action => 'change_status', :id => @issue}, :multipart => true, :class => "tabular") do %>
             <%= hidden_field_tag 'confirm', 1 %>
             <%= hidden_field_tag 'new_status_id', @new_status.id %>
             <div class="box">
             <p><label><%=l(:label_issue_status_new)%></label> <%= @new_status.name %></p>
             <p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label>
             <select name="issue[assigned_to_id]">
             <option value=""></option>
             <%= options_from_collection_for_select @assignable_to, "id", "display_name", @issue.assigned_to_id %></p>
             </select></p>
             <p><label for="issue_done_ratio"><%=l(:field_done_ratio)%></label>
             <%= select("issue", "done_ratio", ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) ) %>
             </select></p>
             <p><label for="issue_fixed_version"><%=l(:field_fixed_version)%></label>
             <select name="issue[fixed_version_id]">
             <option value="">--none--</option>
             <%= options_from_collection_for_select @issue.project.versions, "id", "name", @issue.fixed_version_id %>
             </select></p>
             <p><label for="notes"><%= l(:field_notes) %></label>
             <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %></p>
+            <% if authorize_for('issues', 'add_attachment') %>
+            <p id="attachments_p"><label><%=l(:label_attachment_new)%>
+            <%= image_to_function "add.png", "addFileField();return false" %></label>
+            <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+            <% end %>
             </div>
             <%= hidden_field 'issue', 'lock_version' %>
             <%= submit_tag l(:button_save) %>
             <% 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