From 57d3aafc6ea99f57672e3e88ceba07b5a76ee321 Mon Sep 17 00:00:00 2001 From: christianbeeznst Date: Thu, 18 Jul 2024 10:32:57 -0500 Subject: [PATCH] Internal: Improve pagination and more items for file info page --- .../Controller/Admin/AdminController.php | 2 +- .../views/Admin/files_info.html.twig | 134 ++++++++++-------- 2 files changed, 74 insertions(+), 62 deletions(-) diff --git a/src/CoreBundle/Controller/Admin/AdminController.php b/src/CoreBundle/Controller/Admin/AdminController.php index 1650a312c0..e72802b338 100644 --- a/src/CoreBundle/Controller/Admin/AdminController.php +++ b/src/CoreBundle/Controller/Admin/AdminController.php @@ -58,7 +58,7 @@ class AdminController extends BaseController $files = $resourceFileRepository->searchFiles($search, $offset, self::ITEMS_PER_PAGE); $totalItems = $resourceFileRepository->countFiles($search); - $totalPages = ceil($totalItems / self::ITEMS_PER_PAGE); + $totalPages = $totalItems > 0 ? ceil($totalItems / self::ITEMS_PER_PAGE) : 1; $fileUrls = []; $filePaths = []; diff --git a/src/CoreBundle/Resources/views/Admin/files_info.html.twig b/src/CoreBundle/Resources/views/Admin/files_info.html.twig index 0e6ba2de22..1ad492fc83 100644 --- a/src/CoreBundle/Resources/views/Admin/files_info.html.twig +++ b/src/CoreBundle/Resources/views/Admin/files_info.html.twig @@ -9,72 +9,78 @@ - - - - - - - - - - - - {% for file in files %} + {% if files is empty %} +

{{ 'No results found.'|trans }}

+ {% else %} +
{{ 'Title'|trans }}{{ 'Original Name'|trans }}{{ 'Course'|trans }}{{ 'User'|trans }}{{ 'Actions'|trans }}
+ - - - - - + + + + + - {% endfor %} - -
{{ file.title }}{{ file.originalName }} - {% if file.resourceNode and file.resourceNode.resourceLinks|length > 0 %} - {{ file.resourceNode.resourceLinks|first.course.title ?? 'N/A' }} - {% else %} - {{ 'N/A'|trans }} - {% endif %} - - {% if file.resourceNode and file.resourceNode.resourceLinks|length > 0 %} - {{ file.resourceNode.resourceLinks|first.user.username ?? 'N/A' }} - {% elseif file.resourceNode and file.resourceNode.creator %} - {{ file.resourceNode.creator.username ?? 'N/A' }} - {% else %} - {{ 'N/A'|trans }} - {% endif %} - - - {{ 'View'|trans }} - - {{ 'Title'|trans }}{{ 'Original Name'|trans }}{{ 'Course'|trans }}{{ 'User'|trans }}{{ 'Actions'|trans }}
+ + + {% for file in files %} + + {{ file.title }} + {{ file.originalName }} + + {% if file.resourceNode and file.resourceNode.resourceLinks|length > 0 %} + {{ file.resourceNode.resourceLinks|first.course.title ?? 'N/A' }} + {% else %} + {{ 'N/A'|trans }} + {% endif %} + + + {% if file.resourceNode and file.resourceNode.resourceLinks|length > 0 %} + {{ file.resourceNode.resourceLinks|first.user.username ?? 'N/A' }} + {% elseif file.resourceNode and file.resourceNode.creator %} + {{ file.resourceNode.creator.username ?? 'N/A' }} + {% else %} + {{ 'N/A'|trans }} + {% endif %} + + + + {{ 'View'|trans }} + + + + {% endfor %} + + - + {% endif %} @@ -110,6 +118,8 @@ var user = button.getAttribute('data-user'); var filePath = button.getAttribute('data-file-path'); var fileUrl = button.getAttribute('data-file-url'); + var resourceNodeId = button.getAttribute('data-resource-node-id'); + var resourceFileId = button.getAttribute('data-resource-file-id'); document.getElementById('file-title').textContent = title; document.getElementById('file-mime-type').textContent = mimeType; @@ -119,6 +129,8 @@ document.getElementById('file-user').textContent = user; document.getElementById('file-path').textContent = filePath; document.getElementById('file-url').href = fileUrl; + document.getElementById('resource-node-id').textContent = resourceNodeId; + document.getElementById('resource-file-id').textContent = resourceFileId; modal.style.display = "block"; };