diff options
author | James Lopez <james@jameslopez.es> | 2018-02-08 17:45:12 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2018-02-23 16:02:39 +0300 |
commit | 6d885f9c92cdb6e2d8ad332af2490d25269b5f9f (patch) | |
tree | 3f7c6f84d3a2edcfd86bcfe89a42cd315ab8e9d6 /app/helpers | |
parent | 9053f8eb4b94669d18674552b8f588071d8c76c6 (diff) |
some more refactoring
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/blob_helper.rb | 12 | ||||
-rw-r--r-- | app/helpers/tree_helper.rb | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 8546e72a8a9..3f187a41735 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -27,7 +27,7 @@ module BlobHelper elsif !current_user || (current_user && can_modify_blob?(blob, project, ref)) edit_link_tag(edit_text, ide_edit_path(project, ref, path, options), common_classes) elsif current_user && can?(current_user, :fork_project, project) - edit_blob_fork(common_classes, options, path, project, ref) + edit_blob_fork(common_classes, edit_blob_path(project, ref, path, options), project, edit_in_new_fork_notice) end end @@ -56,7 +56,7 @@ module BlobHelper elsif current_user && can_modify_blob?(blob, project, ref) edit_link_tag(ide_edit_text, ide_edit_path(project, ref, path, options), common_classes) elsif current_user && can?(current_user, :fork_project, project) - edit_blob_fork(common_classes, options, path, project, ref) + edit_blob_fork(common_classes, edit_blob_path(project, ref, path, options), project, edit_in_new_fork_notice) end end @@ -76,7 +76,7 @@ module BlobHelper elsif can_modify_blob?(blob, project, ref) button_tag label, class: "#{common_classes}", 'data-target' => "#modal-#{modal_type}-blob", 'data-toggle' => 'modal' elsif can?(current_user, :fork_project, project) - edit_blob_fork(common_classes, options, path, project, ref) + edit_blob_fork(common_classes, request.fullpath, project, edit_in_new_fork_notice_action(action), action) end end @@ -311,10 +311,10 @@ module BlobHelper blob if blob&.readable_text? end - def edit_blob_fork(common_classes, options, path, project, ref) + def edit_blob_fork(common_classes, path, project, notice, action = 'edit') continue_params = { - to: edit_blob_path(project, ref, path, options), - notice: edit_in_new_fork_notice, + to: path, + notice: notice, notice_now: edit_in_new_fork_notice_now } fork_path = project_forks_path(project, namespace_key: current_user.namespace.id, continue: continue_params) diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index f5733b4b57c..f6a6d9bebde 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -83,6 +83,10 @@ module TreeHelper " A fork of this project has been created that you can make changes in, so you can submit a merge request." end + def edit_in_new_fork_notice_action(action) + edit_in_new_fork_notice + " Try to #{action} this file again." + end + def commit_in_fork_help "A new branch will be created in your fork and a new merge request will be started." end |