diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-01 13:39:37 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-01 13:39:37 +0300 |
commit | 56d15660b8e89ae0bc37953b4fe24739323e5921 (patch) | |
tree | 352a1dd9366c418031bcce40892c71692ecc442b /app/helpers/tree_helper.rb | |
parent | 083d66563e8275fd13851ec0a1974cb17379f84f (diff) | |
download | gitlab-ce-56d15660b8e89ae0bc37953b4fe24739323e5921.tar.gz |
gitlab_git to 1.0.6, return submodule rendering in tree
Diffstat (limited to 'app/helpers/tree_helper.rb')
-rw-r--r-- | app/helpers/tree_helper.rb | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index e7002f60b8a..1f764ea1038 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -5,24 +5,18 @@ module TreeHelper # contents - A Grit::Tree object for the current tree def render_tree(tree) # Render Folders before Files/Submodules - folders, files = tree.trees, tree.blobs + folders, files, submodules = tree.trees, tree.blobs, tree.submodules tree = "" # Render folders if we have any tree += render partial: 'tree/tree_item', collection: folders, locals: {type: 'folder'} if folders.present? - files.each do |f| - 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/blob_item', object: f, locals: {type: 'file'} - end + # Render files if we have any + tree += render partial: 'tree/blob_item', collection: files, locals: {type: 'file'} if files.present? - tree += html if html.present? - end + # Render submodules if we have any + tree += render partial: 'tree/submodule_item', collection: submodules if submodules.present? tree.html_safe end |