From d7c9886b8c6d8b7c997ef0bddcd497cf094a4012 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 10 Jan 2010 14:05:42 +0000 Subject: [PATCH] Fixed: attachments get saved on issue update even if validation fails (#4401). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3305 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/issues_controller.rb | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index cd435ebe7..ded4e1a52 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -187,22 +187,22 @@ class IssuesController < ApplicationController if request.post? @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today) @time_entry.attributes = params[:time_entry] - attachments = attach_files(@issue, params[:attachments]) - attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)} - - call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal}) - - if (@time_entry.hours.nil? || @time_entry.valid?) && @issue.save - # Log spend time - if User.current.allowed_to?(:log_time, @project) - @time_entry.save + if (@time_entry.hours.nil? || @time_entry.valid?) && @issue.valid? + attachments = attach_files(@issue, params[:attachments]) + attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)} + call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal}) + if @issue.save + # Log spend time + if User.current.allowed_to?(:log_time, @project) + @time_entry.save + end + if !journal.new_record? + # Only send notification if something was actually changed + flash[:notice] = l(:notice_successful_update) + end + call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal}) + redirect_to(params[:back_to] || {:action => 'show', :id => @issue}) end - if !journal.new_record? - # Only send notification if something was actually changed - flash[:notice] = l(:notice_successful_update) - end - call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal}) - redirect_to(params[:back_to] || {:action => 'show', :id => @issue}) end end rescue ActiveRecord::StaleObjectError