Merge pull request #89 from VictoriqueMoe/fix-non-expire

Fix DTO return for non expiring files
waifuvault · Mar 4, 2024 · f827b22 · f827b22
2 parents aeea997 + 320a957
commit f827b22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/model/rest/FileEntry.ts b/src/model/rest/FileEntry.ts
@@ -60,6 +60,8 @@ export class FileEntry {
         const expiresIn = entry.expiresIn;
         if (expiresIn !== null) {
             fileEntryBuilder.expires(ObjectUtils.timeToHuman(expiresIn));
+        } else {
+            fileEntryBuilder.expires(null);
         }
         return fileEntryBuilder.build();
     }

diff --git a/src/public/secure/files.ejs b/src/public/secure/files.ejs
@@ -45,7 +45,6 @@
                             <th scope="col">file Size</th>
                             <th scope="col">Created At</th>
                             <th scope="col">expires</th>
-                            <th scope="col">ip</th>
                             <th scope="col">mediaType</th>
                             <th scope="col">original FileName</th>
                             <th scope="col">url</th>
@@ -200,8 +199,7 @@
                             {data: 'fileExtension', className: 'col-fileext'},
                             {data: 'fileSize', render: sizeAsMB()},
                             {data: 'createdAt', render: customDate()},
-                            {data: 'expires'},
-                            {data: 'ip', render: colouredIP(), className: 'col-ip'},
+                            {data: 'expires', render: renderNullField()},
                             {data: 'mediaType', render: renderNullField()},
                             {data: 'originalFileName'},
                             {data: 'url'},