summaryrefslogtreecommitdiff
path: root/app/helpers/tree_helper.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-05 17:15:20 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-03-05 17:15:20 +0200
commita99ad3d355f22907b38fad0a5b276e176c3901a7 (patch)
tree5e61a08b5fc5534c02e83f7af8a1e2254f2b31e6 /app/helpers/tree_helper.rb
parent9ba21dd0c4255692594f5d4e9a6efb7b9646c465 (diff)
downloadgitlab-ce-a99ad3d355f22907b38fad0a5b276e176c3901a7.tar.gz
tree_heleper: concat html only if present. Avoid nil exception
Diffstat (limited to 'app/helpers/tree_helper.rb')
-rw-r--r--app/helpers/tree_helper.rb16
1 files changed, 9 insertions, 7 deletions
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index 0f2b695e0ad..fab0085ba73 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -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