From 73c4c995f90ab84ff1a3cff24d2cb189003f54a0 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 23 Feb 2018 16:04:31 +0100
Subject: [PATCH] inline methods

---
 app/helpers/blob_helper.rb                    | 30 +++++--------------
 .../projects/tree/_tree_header.html.haml      |  4 +--
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 40a6a7ca574..551af3301db 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -23,32 +23,16 @@ module BlobHelper
 
     edit_button_tag(blob,
                     common_classes,
-                    edit_text,
+                    _('Edit'),
                     edit_blob_path(project, ref, path, options),
                     project,
                     ref)
   end
 
-  def user_can_fork_project?(project)
-    current_user && can?(current_user, :fork_project, project)
-  end
-
   def display_modify_blob?(blob, project, ref)
     !current_user || (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
-
-  def edit_text
-    _('Edit')
-  end
-
-  def ide_edit_text
-    _('Web IDE')
-  end
-
   def ide_edit_button(project = @project, ref = @ref, path = @path, options = {})
     return unless show_new_ide?
     return unless blob = readable_blob(options, path, project, ref)
@@ -57,13 +41,13 @@ module BlobHelper
 
     edit_button_tag(blob,
                     common_classes,
-                    ide_edit_text,
-                    ide_edit_path(project, ref, path, options),
+                    _('Web IDE'),
+                    "#{ide_path}/project#{edit_blob_path(project, ref, path, options)}",
                     project,
                     ref)
   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
 
     blob = project.repository.blob_at(ref, path) rescue nil
@@ -84,7 +68,7 @@ module BlobHelper
   end
 
   def replace_blob_link(project = @project, ref = @ref, path = @path)
-    modify_file_element(
+    modify_file_button(
       project,
       ref,
       path,
@@ -96,7 +80,7 @@ module BlobHelper
   end
 
   def delete_blob_link(project = @project, ref = @ref, path = @path)
-    modify_file_element(
+    modify_file_button(
       project,
       ref,
       path,
@@ -353,7 +337,7 @@ module BlobHelper
       # Web IDE (Beta) requires the user to have this feature enabled
     elsif display_modify_blob?(blob, project, ref)
       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))
     end
   end
diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml
index 05539dfed7c..ff3928552af 100644
--- a/app/views/projects/tree/_tree_header.html.haml
+++ b/app/views/projects/tree/_tree_header.html.haml
@@ -74,8 +74,8 @@
 .tree-controls
   - if show_new_ide?
     = succeed " " do
-      = link_to ide_edit_path(@project, @id), class: 'btn btn-default' do
-        = ide_edit_text
+      = link_to "#{ide_path}/project#{edit_blob_path(@project, @id, @path, {})}", class: 'btn btn-default' do
+        = _('Web IDE')
 
   = link_to s_('Commits|History'), project_commits_path(@project, @id), class: 'btn'
 
-- 
GitLab