creates_commit.rb 3.54 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
module CreatesCommit
  extend ActiveSupport::Concern

  def create_commit(service, success_path:, failure_path:, failure_view: nil, success_notice: nil)
    set_commit_variables

    commit_params = @commit_params.merge(
      source_project: @project,
      source_branch: @ref,
      target_branch: @target_branch
    )

    result = service.new(@tree_edit_project, current_user, commit_params).execute

    if result[:status] == :success
16
      update_flash_notice(success_notice)
17 18

      respond_to do |format|
19
        format.html { redirect_to final_success_path(success_path) }
20
        format.json { render json: { message: "success", filePath: final_success_path(success_path) } }
21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
      end
    else
      flash[:alert] = result[:message]
      respond_to do |format|
        format.html do
          if failure_view
            render failure_view
          else
            redirect_to failure_path
          end
        end
        format.json { render json: { message: "failed", filePath: failure_path } }
      end
    end
  end

  def authorize_edit_tree!
38
    return if can_collaborate_with_project?
39 40 41 42 43 44

    access_denied!
  end

  private

45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
  def update_flash_notice(success_notice)
    flash[:notice] = success_notice || "Your changes have been successfully committed."

    if create_merge_request?
      if merge_request_exists?
        flash[:notice] = nil
      else
        target = different_project? ? "project" : "branch"
        flash[:notice] << " You can now submit a merge request to get this change into the original #{target}."
      end
    end
  end

  def final_success_path(success_path)
    return success_path unless create_merge_request?

    merge_request_exists? ? existing_merge_request_path : new_merge_request_path
  end

64 65 66 67 68 69 70 71 72 73 74 75 76
  def new_merge_request_path
    new_namespace_project_merge_request_path(
      @mr_source_project.namespace,
      @mr_source_project,
      merge_request: {
        source_project_id: @mr_source_project.id,
        target_project_id: @mr_target_project.id,
        source_branch: @mr_source_branch,
        target_branch: @mr_target_branch
      }
    )
  end

77
  def existing_merge_request_path
78 79 80 81
    namespace_project_merge_request_path(@mr_target_project.namespace, @mr_target_project, @merge_request)
  end

  def merge_request_exists?
82 83 84
    return @merge_request if defined?(@merge_request)

    @merge_request = @mr_target_project.merge_requests.opened.find_by(
Rubén Dávila's avatar
Rubén Dávila committed
85 86 87
      source_branch: @mr_source_branch,
      target_branch: @mr_target_branch
    )
88 89
  end

90 91 92 93 94 95 96 97 98 99 100 101 102
  def different_project?
    @mr_source_project != @mr_target_project
  end

  def different_branch?
    @mr_source_branch != @mr_target_branch || different_project?
  end

  def create_merge_request?
    params[:create_merge_request].present? && different_branch?
  end

  def set_commit_variables
103
    @mr_source_branch ||= @target_branch
104 105 106 107 108 109 110 111 112 113 114 115 116

    if can?(current_user, :push_code, @project)
      # Edit file in this project
      @tree_edit_project = @project
      @mr_source_project = @project

      if @project.forked?
        # Merge request from this project to fork origin
        @mr_target_project = @project.forked_from_project
        @mr_target_branch = @mr_target_project.repository.root_ref
      else
        # Merge request to this project
        @mr_target_project = @project
117
        @mr_target_branch ||= @ref
118 119 120 121 122 123 124
      end
    else
      # Edit file in fork
      @tree_edit_project = current_user.fork_of(@project)
      # Merge request from fork to this project
      @mr_source_project = @tree_edit_project
      @mr_target_project = @project
125
      @mr_target_branch  ||= @ref
126 127 128
    end
  end
end