From e22bef75b4f2001949f7c43da908155a4434ae4e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Mon, 11 Jul 2016 19:58:16 +0200
Subject: [PATCH] file-browser: fixes #4083

---
 rhodecode/controllers/files.py                |  2 +-
 rhodecode/templates/files/files_browser.html  | 62 +------------------
 .../templates/files/files_browser_tree.html   | 60 ++++++++++++++++++
 rhodecode/templates/files/files_pjax.html     |  2 +-
 4 files changed, 64 insertions(+), 62 deletions(-)
 create mode 100644 rhodecode/templates/files/files_browser_tree.html

diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
index 6116832f..25723a2c 100644
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -140,7 +140,7 @@ class FilesController(BaseRepoController):
         def _cached_tree():
             log.debug('Generating cached file tree for %s, %s, %s',
                       repo_name, commit_id, f_path)
-            return render('files/files_browser.html')
+            return render('files/files_browser_tree.html')
 
         cache_manager = self.__get_tree_cache_manager(
             repo_name, caches.FILE_TREE)
diff --git a/rhodecode/templates/files/files_browser.html b/rhodecode/templates/files/files_browser.html
index 46685ae3..c486519b 100644
--- a/rhodecode/templates/files/files_browser.html
+++ b/rhodecode/templates/files/files_browser.html
@@ -41,67 +41,9 @@
             </div>
         </div>
     </div>
+    ## file tree is computed from caches, and filled in
+    ${c.file_tree}
 
-    <div class="browser-body">
-        <table class="code-browser rctable">
-            <thead>
-                <tr>
-                    <th>${_('Name')}</th>
-                    <th>${_('Size')}</th>
-                    <th>${_('Modified')}</th>
-                    <th>${_('Last Commit')}</th>
-                    <th>${_('Author')}</th>
-                </tr>
-            </thead>
-
-            <tbody id="tbody">
-              %if c.file.parent:
-              <tr class="parity0">
-                <td class="td-componentname">
-                  <a href='${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=c.file.parent.path)}' class="pjax-link">
-                    <i class="icon-folder"></i>..
-                  </a>
-                </td>
-                <td></td>
-                <td></td>
-                <td></td>
-                <td></td>
-              </tr>
-              %endif
-              %for cnt,node in enumerate(c.file):
-              <tr class="parity${cnt%2}">
-                <td class="td-componentname">
-                %if node.is_submodule():
-                  <span class="submodule-dir">
-                    ${h.link_to_if(
-                        node.url.startswith('http://') or node.url.startswith('https://'),
-                        node.name,node.url)}
-                  </span>
-                %else:
-                  <a href='${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=h.safe_unicode(node.path))}' class="pjax-link">
-                    <i class="${"icon-file browser-file" if node.is_file() else "icon-folder browser-dir"}"></i>${node.name}
-                  </a>
-                %endif
-                </td>
-                %if node.is_file():
-                  <td class="td-size" title="${'size-%s' % node.name}"></td>
-                  <td class="td-time" title="${'modified_at-%s' % node.name}">
-                    <span class="browser-loading">${_('Loading...')}</span>
-                  </td>
-                  <td class="td-hash" title="${'revision-%s' % node.name}"></td>
-                  <td class="td-user" title="${'author-%s' % node.name}"></td>
-                %else:
-                  <td></td>
-                  <td></td>
-                  <td></td>
-                  <td></td>
-                %endif
-              </tr>
-              %endfor
-            </tbody>
-            <tbody id="tbody_filtered"></tbody>
-        </table>
-    </div>
 </div>
 
 <script>
diff --git a/rhodecode/templates/files/files_browser_tree.html b/rhodecode/templates/files/files_browser_tree.html
new file mode 100644
index 00000000..43d8d8a4
--- /dev/null
+++ b/rhodecode/templates/files/files_browser_tree.html
@@ -0,0 +1,60 @@
+<div class="browser-body">
+    <table class="code-browser rctable">
+        <thead>
+            <tr>
+                <th>${_('Name')}</th>
+                <th>${_('Size')}</th>
+                <th>${_('Modified')}</th>
+                <th>${_('Last Commit')}</th>
+                <th>${_('Author')}</th>
+            </tr>
+        </thead>
+
+        <tbody id="tbody">
+          %if c.file.parent:
+          <tr class="parity0">
+            <td class="td-componentname">
+              <a href="${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=c.file.parent.path)}" class="pjax-link">
+                <i class="icon-folder"></i>..
+              </a>
+            </td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          %endif
+          %for cnt,node in enumerate(c.file):
+          <tr class="parity${cnt%2}">
+            <td class="td-componentname">
+            %if node.is_submodule():
+              <span class="submodule-dir">
+                ${h.link_to_if(
+                    node.url.startswith('http://') or node.url.startswith('https://'),
+                    node.name,node.url)}
+              </span>
+            %else:
+              <a href="${h.url('files_home',repo_name=c.repo_name,revision=c.commit.raw_id,f_path=h.safe_unicode(node.path))}" class="pjax-link">
+                <i class="${'icon-file browser-file' if node.is_file() else 'icon-folder browser-dir'}"></i>${node.name}
+              </a>
+            %endif
+            </td>
+            %if node.is_file():
+              <td class="td-size" title="${'size-%s' % node.name}"></td>
+              <td class="td-time" title="${'modified_at-%s' % node.name}">
+                <span class="browser-loading">${_('Loading...')}</span>
+              </td>
+              <td class="td-hash" title="${'revision-%s' % node.name}"></td>
+              <td class="td-user" title="${'author-%s' % node.name}"></td>
+            %else:
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+            %endif
+          </tr>
+          %endfor
+        </tbody>
+        <tbody id="tbody_filtered"></tbody>
+    </table>
+</div>
\ No newline at end of file
diff --git a/rhodecode/templates/files/files_pjax.html b/rhodecode/templates/files/files_pjax.html
index 9669f614..993dd945 100644
--- a/rhodecode/templates/files/files_pjax.html
+++ b/rhodecode/templates/files/files_pjax.html
@@ -40,7 +40,7 @@
             <%include file='file_tree_author_box.html'/>
         </div>
 
-        ${c.file_tree}
+        <%include file='files_browser.html'/>
     % else:
         <div id="file_authors" class="sidebar-right">
             <%include file='file_authors_box.html'/>