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

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

Browse source
This commit is contained in:
Patricio Cano 2016-09-05 13:14:49 -05:00
parent a8b0d50101
commit c788c66a85
7 changed files with 33 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/helpers/groups_helper.rb
View file

@ -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

4
app/helpers/projects_helper.rb
View file

@ -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

4
app/models/project.rb
View file

@ -393,10 +393,6 @@ class Project < ActiveRecord::Base
end
def lfs_enabled?
# Specifically check is lfs_enabled is false
return false if self[:lfs_enabled] == false
# Should only fallback to the namespace value if no value is set for the project
return namespace.lfs_enabled? if self[:lfs_enabled].nil?
self[:lfs_enabled] && Gitlab.config.lfs.enabled

3
app/views/admin/groups/show.html.haml
View file

@ -40,8 +40,7 @@
%li
%span.light Group Git LFS status:
%strong
= lfs_status_helper(@group)
= projects_with_lfs_enabled(@group)
= group_lfs_status(@group)
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
.panel.panel-default

2
app/views/admin/projects/show.html.haml
View file

@ -77,7 +77,7 @@
%li
%span.light Git LFS status:
%strong
= lfs_status_helper(@project)
= project_lfs_status(@project)
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
- else
%li

17
app/views/projects/edit.html.haml
View file

@ -84,15 +84,14 @@
= project_feature_access_select(:snippets_access_level)
- if Gitlab.config.lfs.enabled && current_user.admin?
.form-group
.checkbox
= f.label :lfs_enabled do
= f.check_box :lfs_enabled, checked: @project.lfs_enabled?
%strong LFS
%br
%span.descr
Git Large File Storage
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
.row
.col-md-9
= f.label :lfs_enabled, 'LFS', class: 'label-light'
%span.help-block
Git Large File Storage
= link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs')
.col-md-3
= f.select :lfs_enabled, [%w(Enabled true), %w(Disabled false)], {}, selected: @project.lfs_enabled?, class: 'pull-right form-control'
- if Gitlab.config.registry.enabled
.form-group

17
db/migrate/20160901213340_add_lfs_enabled_to_namespaces.rb
View file

@ -4,25 +4,8 @@
class AddLfsEnabledToNamespaces < ActiveRecord::Migration
include Gitlab::Database::MigrationHelpers
# Set this constant to true if this migration requires downtime.
DOWNTIME = false
# When a migration requires downtime you **must** uncomment the following
# constant and define a short and easy to understand explanation as to why the
# migration requires downtime.
# DOWNTIME_REASON = ''
# When using the methods "add_concurrent_index" or "add_column_with_default"
# you must disable the use of transactions as these methods can not run in an
# existing transaction. When using "add_concurrent_index" make sure that this
# method is the _only_ method called in the migration, any other changes
# should go in a separate migration. This ensures that upon failure _only_ the
# index creation fails and can be retried or reverted easily.
#
# To disable transactions uncomment the following line and remove these
# comments:
# disable_ddl_transaction!
def change
add_column :namespaces, :lfs_enabled, :boolean
end