--- redmine/app/models/issue.rb.bak 2011-05-20 13:43:42.622806962 +0200 +++ redmine/app/models/issue.rb 2011-05-20 14:14:30.012808508 +0200 @@ -489,6 +489,7 @@ # Saves an issue, time_entry, attachments, and a journal from the parameters # Returns false if save fails def save_issue_with_child_records(params, existing_time_entry=nil) + Issue.transaction do if params[:time_entry] && params[:time_entry][:hours].present? && User.current.allowed_to?(:log_time, project) @time_entry = existing_time_entry || TimeEntry.new @@ -518,6 +519,8 @@ errors.add_to_base l(:notice_locking_conflict) raise ActiveRecord::Rollback end + else + raise ActiveRecord::Rollback end end end