From a99ad3d355f22907b38fad0a5b276e176c3901a7 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 5 Mar 2013 17:15:20 +0200
Subject: [PATCH] tree_heleper: concat html only if present. Avoid nil
exception
---
app/helpers/tree_helper.rb | 16 +++++++++-------
1 file 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
--
GitLab