Fixed incorrectly nested display of object file list. https://trello.…

…com/c/cz1QIJ5k
APTrust · Jan 16, 2024 · 9aa894e · 9aa894e
1 parent d8a6000
commit 9aa894e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/views/objects/_file_list.html b/views/objects/_file_list.html
@@ -102,9 +102,11 @@ <h3 class="mb-4">Checksums</h3>
     </tr>
     {{ end }}
   </table>
+
+  {{ template "shared/_pager.html" dict "pager" .filePager "xhrTarget" "objFileList" }}
+
 </div>
 
-{{ template "shared/_pager.html" dict "pager" .filePager "xhrTarget" "objFileList" }}
 
 
 {{ end }}
diff --git a/web/webui/intellectual_objects_controller.go b/web/webui/intellectual_objects_controller.go
@@ -163,7 +163,10 @@ func IntellectualObjectFiles(c *gin.Context) {
 // Select max 20 files to start. Some objects have > 100k files, and
 // we definitely don't want that many results. Let the user page through.
 func loadFiles(req *Request, objID int64) error {
-	baseURL := req.GinContext.Request.URL.Path + "?" + req.GinContext.Request.URL.RawQuery
+	// Load files list inside objFileList div, withouth header
+	// and side nav. See https://trello.com/c/cz1QIJ5k
+	correctedPath := strings.Replace(req.GinContext.Request.URL.Path, "/objects/show", "/objects/files", 1)
+	baseURL := correctedPath + "?" + req.GinContext.Request.URL.RawQuery
 	pager, err := common.NewPager(req.GinContext, baseURL, 20)
 	if err != nil {
 		return err