kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

inline methods

Browse source
This commit is contained in:
James Lopez 2018-02-23 16:04:31 +01:00
parent b8028c6ccc
commit 73c4c995f9
No known key found for this signature in database
GPG key ID: 756BF8E9D7C0CF39
2 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/helpers/blob_helper.rb
View file

@ -23,32 +23,16 @@ module BlobHelper
edit_button_tag(blob, edit_button_tag(blob,
common_classes, common_classes,
edit_text, _('Edit'),
edit_blob_path(project, ref, path, options), edit_blob_path(project, ref, path, options),
project, project,
ref) ref)
end end
def user_can_fork_project?(project)
current_user && can?(current_user, :fork_project, project)
end
def display_modify_blob?(blob, project, ref) def display_modify_blob?(blob, project, ref)
!current_user || (current_user && can_modify_blob?(blob, project, ref)) !current_user || (current_user && can_modify_blob?(blob, project, ref))
end end
def ide_edit_path(project = @project, ref = @ref, path = @path, options = {})
"#{ide_path}/project#{edit_blob_path(project, ref, path, options)}"
end
def edit_text
_('Edit')
end
def ide_edit_text
_('Web IDE')
end
def ide_edit_button(project = @project, ref = @ref, path = @path, options = {}) def ide_edit_button(project = @project, ref = @ref, path = @path, options = {})
return unless show_new_ide? return unless show_new_ide?
return unless blob = readable_blob(options, path, project, ref) return unless blob = readable_blob(options, path, project, ref)
@ -57,13 +41,13 @@ module BlobHelper
edit_button_tag(blob, edit_button_tag(blob,
common_classes, common_classes,
ide_edit_text, _('Web IDE'),
ide_edit_path(project, ref, path, options), "#{ide_path}/project#{edit_blob_path(project, ref, path, options)}",
project, project,
ref) ref)
end end
def modify_file_element(project = @project, ref = @ref, path = @path, label:, action:, btn_class:, modal_type:) def modify_file_button(project = @project, ref = @ref, path = @path, label:, action:, btn_class:, modal_type:)
return unless current_user return unless current_user
blob = project.repository.blob_at(ref, path) rescue nil blob = project.repository.blob_at(ref, path) rescue nil
@ -84,7 +68,7 @@ module BlobHelper
end end
def replace_blob_link(project = @project, ref = @ref, path = @path) def replace_blob_link(project = @project, ref = @ref, path = @path)
modify_file_element( modify_file_button(
project, project,
ref, ref,
path, path,
@ -96,7 +80,7 @@ module BlobHelper
end end
def delete_blob_link(project = @project, ref = @ref, path = @path) def delete_blob_link(project = @project, ref = @ref, path = @path)
modify_file_element( modify_file_button(
project, project,
ref, ref,
path, path,
@ -353,7 +337,7 @@ module BlobHelper
# Web IDE (Beta) requires the user to have this feature enabled # Web IDE (Beta) requires the user to have this feature enabled
elsif display_modify_blob?(blob, project, ref) elsif display_modify_blob?(blob, project, ref)
edit_link_tag(text, edit_path, common_classes) edit_link_tag(text, edit_path, common_classes)
elsif user_can_fork_project?(project) elsif current_user && can?(current_user, :fork_project, project)
edit_fork_button_tag(common_classes, project, text, edit_blob_fork_params(edit_path)) edit_fork_button_tag(common_classes, project, text, edit_blob_fork_params(edit_path))
end end
end end

4
app/views/projects/tree/_tree_header.html.haml
View file

@ -74,8 +74,8 @@
.tree-controls .tree-controls
- if show_new_ide? - if show_new_ide?
= succeed " " do = succeed " " do
= link_to ide_edit_path(@project, @id), class: 'btn btn-default' do = link_to "#{ide_path}/project#{edit_blob_path(@project, @id, @path, {})}", class: 'btn btn-default' do
= ide_edit_text = _('Web IDE')
= link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn' = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn'