summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2018-02-19 11:38:31 +0100
committerJames Lopez <james@jameslopez.es>2018-02-23 14:02:40 +0100
commit228b757d29a141c4fda0e7c4be75784a6cefe427 (patch)
tree765fe1b042abb1d3ed773175ecf468bddcc5a2ed
parent9753396fe2da21fdb1cc7656e4bf33e28f374363 (diff)
downloadgitlab-ce-228b757d29a141c4fda0e7c4be75784a6cefe427.tar.gz
refactor blob link methods
-rw-r--r--app/helpers/blob_helper.rb21
1 files changed, 11 insertions, 10 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 3c45f670015..6322eb1b671 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -24,19 +24,24 @@ module BlobHelper
if !on_top_of_branch?(project, ref)
edit_button_tag(edit_text, common_classes)
# This condition applies to anonymous or users who can edit directly
- elsif !current_user || user_can_modify_blob(blob, project, ref)
+ elsif !current_user || user_can_modify_blob?(blob, project, ref)
edit_link_tag(edit_text, edit_blob_path(project, ref, path, options), common_classes)
- elsif user_can_fork_project(project)
+ elsif user_can_fork_project?(project)
edit_fork_button_tag(common_classes,
- project, edit_text,
+ project,
+ edit_text,
edit_blob_fork_params(edit_blob_path(project, ref, path, options)))
end
end
- def user_can_fork_project(project)
+ def user_can_fork_project?(project)
current_user && can?(current_user, :fork_project, project)
end
+ def user_can_modify_blob?(blob, project, ref)
+ current_user && can_modify_blob?(blob, project, ref)
+ end
+
def ide_edit_path(project = @project, ref = @ref, path = @path, options = {})
"#{ide_path}/project#{edit_blob_path(project, ref, path, options)}"
end
@@ -59,9 +64,9 @@ module BlobHelper
edit_button_tag(ide_edit_text, common_classes)
# This condition only applies to users who are logged in
# Web IDE (Beta) requires the user to have this feature enabled
- elsif user_can_modify_blob(blob, project, ref)
+ elsif user_can_modify_blob?(blob, project, ref)
edit_link_tag(ide_edit_text, ide_edit_path(project, ref, path, options), common_classes)
- elsif user_can_fork_project(project)
+ elsif user_can_fork_project?(project)
edit_fork_button_tag(common_classes,
project,
ide_edit_text,
@@ -69,10 +74,6 @@ module BlobHelper
end
end
- def user_can_modify_blob(blob, project, ref)
- current_user && can_modify_blob?(blob, project, ref)
- end
-
def modify_file_element(project = @project, ref = @ref, path = @path, label:, action:, btn_class:, modal_type:)
return unless current_user