Skip to content

Commit 25ab29b

Browse files
committed
Working download if only one file is uploaded to file request, indicator for new file request and add to top instead of appending
1 parent 86ba188 commit 25ab29b

File tree

6 files changed

+16
-5
lines changed

6 files changed

+16
-5
lines changed

internal/webserver/api/Api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ func apiDuplicateFile(w http.ResponseWriter, r requestParser, user models.User)
525525
request.UnlimitedTime,
526526
request.UnlimitedDownloads,
527527
false, // is not being used by storage.DuplicateFile
528-
0) // is not being used by storage.DuplicateFile
528+
0) // is not being used by storage.DuplicateFile
529529
newFile, err := storage.DuplicateFile(file, request.RequestedChanges, request.FileName, uploadRequest)
530530
if err != nil {
531531
sendError(w, http.StatusInternalServerError, err.Error())

internal/webserver/web/static/css/cover.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,10 @@ a:hover {
266266
}
267267

268268

269+
.newFileRequest {
270+
animation: subtleHighlightNewJson 0.7s ease-out;
271+
}
272+
269273
.newApiKey {
270274
animation: subtleHighlightNewJson 0.7s ease-out;
271275
}

internal/webserver/web/static/css/min/gokapi.min.5.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/webserver/web/static/js/admin_ui_filerequest.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,14 @@ function insertOrReplaceFileRequest(jsonResult) {
175175
const user = document.getElementById(`cell-username-${jsonResult.id}`).innerText;
176176
row.replaceWith(createFileRequestRow(jsonResult, user));
177177
} else {
178-
tbody.appendChild(createFileRequestRow(jsonResult, userName));
178+
let tr = createFileRequestRow(jsonResult, userName);
179+
tr.querySelectorAll('td').forEach((td) => {
180+
td.classList.add("newFileRequest");
181+
setTimeout(() => {
182+
td.classList.remove("newFileRequest");
183+
}, 700);
184+
});
185+
tbody.prepend(tr);
179186
}
180187
}
181188

internal/webserver/web/static/js/min/admin.min.15.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/webserver/web/templates/html_uploadrequest.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
{{ end }}
5656
<td>
5757
<div class="btn-group" role="group">
58-
<button id="download-{{ .Id }}" type="button" class="btn btn-outline-light btn-sm {{ if eq .UploadedFiles 0 }} disabled {{ end }}" onclick="" title="Download all"><i class="bi bi-download"></i></button>
58+
<button id="download-{{ .Id }}" type="button" class="btn btn-outline-light btn-sm {{ if eq .UploadedFiles 0 }} disabled {{ end }}" onclick="{{ if eq .UploadedFiles 1 }}downloadFileWithPresign('{{ (index .FileIdList 0) }}', false);{{else}}{{ end }}" title="Download all"><i class="bi bi-download"></i></button>
5959

6060
<button id="edit-{{ .Id }}" type="button" title="Edit request" class="btn btn-outline-light btn-sm" onclick="editFileRequest({{ .Id }}, '{{ .Name }}', {{ .MaxFiles }}, {{ .MaxSize }}, {{ .Expiry }})">
6161
<i class="bi bi-pencil"></i></button>

0 commit comments

Comments
 (0)