Project

General

Profile

Patch #8414 » issue.rb.patch

More lines to compare - Francisco José Martínez, 2011-05-20 14:13

View differences:

redmine/app/models/issue.rb 2011-05-20 14:14:30.012808508 +0200
489 489
  # Saves an issue, time_entry, attachments, and a journal from the parameters
490 490
  # Returns false if save fails
491 491
  def save_issue_with_child_records(params, existing_time_entry=nil)
492

  
492 493
    Issue.transaction do
493 494
      if params[:time_entry] && params[:time_entry][:hours].present? && User.current.allowed_to?(:log_time, project)
494 495
        @time_entry = existing_time_entry || TimeEntry.new
......
518 519
          errors.add_to_base l(:notice_locking_conflict)
519 520
          raise ActiveRecord::Rollback
520 521
        end
522
      else
523
        raise ActiveRecord::Rollback
521 524
      end
522 525
    end
523 526
  end
(2-2/2)