deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tree_heleper: concat html only if present. Avoid nil exception

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-05 17:15:20 +02:00
parent 9ba21dd0c4
commit a99ad3d355
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/helpers/tree_helper.rb
View file

@ -13,13 +13,15 @@ module TreeHelper
tree += render partial: 'tree/tree_item', collection: folders, locals: {type: 'folder'} if folders.present?
files.each do |f|
if f.respond_to?(:url)
# Object is a Submodule
tree += render partial: 'tree/submodule_item', object: f
else
# Object is a Blob
tree += render partial: 'tree/tree_item', object: f, locals: {type: 'file'}
end
html = if f.respond_to?(:url)
# Object is a Submodule
render partial: 'tree/submodule_item', object: f
else
# Object is a Blob
render partial: 'tree/tree_item', object: f, locals: {type: 'file'}
end
tree += html if html.present?
end
tree.html_safe