Improved helper methods, better flow for `project.lfs_enabled?`, and UI fixes.

2 files changed, 23 insertions, 4 deletions

diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index e87197d2056..0352a48e050 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -25,7 +25,26 @@ module GroupsHelper
   end
 
   def projects_with_lfs_enabled(group)
-    total = group.projects.size
-    "#{total - group.projects.select{ |p| !p.lfs_enabled? }.size}/#{total} projects have it enabled"
+    lfs_enabled = group.projects.select(&:lfs_enabled?).size
+    size = group.projects.size
+
+    if lfs_enabled == size || lfs_enabled == 0
+      ' on all projects'
+    else
+      " on #{lfs_enabled}/#{size} projects"
+    end
+  end
+
+  def group_lfs_status(group)
+    if group.lfs_enabled?
+      output = content_tag(:span, class: 'lfs-enabled') do
+        'Enabled'
+      end
+    else
+      output = content_tag(:span, class: 'lfs-disabled') do
+        'Disabled'
+      end
+    end
+    output << projects_with_lfs_enabled(group)
   end
 end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index b4be679c72d..16a8e52a4ca 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -202,8 +202,8 @@ module ProjectsHelper
     nav_tabs.flatten
   end
 
-  def lfs_status_helper(subject)
-    if subject.lfs_enabled?
+  def project_lfs_status(project)
+    if project.lfs_enabled?
       content_tag(:span, class: 'lfs-enabled') do
         'Enabled'
       end