From 4dd5cd2f296d3e9088f5640b2a9b44ad0aae61f2 Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Tue, 22 Jun 2021 18:31:57 +1000
Subject: [PATCH] fixed BUG-36: view details showing all entries -- its a bit
 crap as its only import dir, but its functional again

---
 BUGs                     |  1 -
 templates/file_list.html | 21 ++++++++++++++++++++-
 templates/files.html     |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/BUGs b/BUGs
index 60b8e77..bbf0570 100644
--- a/BUGs
+++ b/BUGs
@@ -2,4 +2,3 @@
 BUG-35: when restarting paweb, the symlinks in static/* are missing, so view file (and move/delete) dont work.
     - suggest the validation code at the start of pa_job_manager, just creates the Symlink, and then remove creation of symlink in Import
     -- need to consider when someone adds/modifies paths in settings, to revalidate
-BUG-36: view details is just doing it for ALL entries, so this needs a how_many / offset or is too SLOW (may in fact need to re-think this whole view - might make more sense to be a toggle on an exising file view, OR, search?)
diff --git a/templates/file_list.html b/templates/file_list.html
index 7591ef0..d9d0cd3 100644
--- a/templates/file_list.html
+++ b/templates/file_list.html
@@ -1,9 +1,28 @@
 {% extends "base.html" %} {% block main_content %}
 		<div class="container">
 			<h3 class="offset-lg-2">{{page_title}}</h3>
+            <form id="main_form" method="POST">
+                <input id="offset" type="hidden" name="offset" value="{{offset}}">
+                <input id="grouping" type="hidden" name="grouping" value="">
+                <input id="size" type="hidden" name="size" value="">
+                <input id="cwd" type="hidden" name="cwd" value="">
+                <input id="folders" type="hidden" name="folders" value="False">
+                <div class="row">
+                    <div class="px-0 input-group col-lg-4">
+                        {{CreateSelect( "noo", noo, ["Oldest", "Newest","A to Z", "Z to A"], "$('#offset').val(0)")|safe }}
+                        {{CreateSelect( "how_many", how_many, ["10", "25", "50", "75", "100", "150", "200", "500"])|safe }}
+                    </div class="input-group...">
+                    <div class="col my-auto d-flex justify-content-center">
+                        <button id="prev" name="prev" class="prev sm-txt btn btn-info"><i class="fas fa-arrow-alt-circle-left"></i></button>
+                        <span class="sm-txt my-auto">&nbsp;{{how_many}} files&nbsp;</span>
+                        <button id="next" name="next" class="next sm-txt btn btn-info"><i class="fas fa-arrow-alt-circle-right"></i></button>
+                    </div class="col...">
+                </div class="row">
+            </form
 			<div class="row">
 				<table class="table table-striped table-sm col-xl-12">
 				<thead><tr class="thead-light"><th>Name</th><th>Size (MB)</th><th>Path Prefix</th><th>Hash</th></tr></thead><tbody>
+
 					{% for obj in entry_data %}
 						<tr><td>
 							{% if obj.type.name == "Directory" %}
@@ -35,7 +54,7 @@
 							{% endif %}
 						</td>
                         {% if obj.type.name != "Directory" %}
-                        <td>{{obj.file_details.size_mb}}</td><td>{{obj.in_dir.path_prefix}}</td><td>{{obj.file_details.hash}}</td>
+                        <td>{{obj.file_details.size_mb}}</td><td>{{obj.in_dir.in_path.path_prefix.replace("static/","")}}/{{obj.in_dir.rel_path}}</td><td>{{obj.file_details.hash}}</td>
 						{% else %}
                         <td></td><td></td><td></td>
                         {% endif %}
diff --git a/templates/files.html b/templates/files.html
index 89c6ff6..15f103d 100644
--- a/templates/files.html
+++ b/templates/files.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block main_content %}
     <div class="container-fluid">
-        <form id="main_form" method="POST"">
+        <form id="main_form" method="POST">
             <input type="hidden" name="cwd" id="cwd" value="{{cwd}}">
             {% if search_term is defined %}
                 <input type="hidden" name="term" id="view_term" value="{{search_term}}">