1
0
mirror of https://git.teknik.io/Teknikode/Teknik.git synced 2023-08-02 14:16:22 +02:00

Added original filenames to each item for creating a new vault from uploads.

This commit is contained in:
Uncled1023 2017-02-14 16:12:27 -08:00
parent 17573b5fd3
commit 6f475d6e03
2 changed files with 16 additions and 3 deletions

View File

@ -81,12 +81,16 @@ function linkCreateVault(element) {
$("div[id^='upload-panel-']").each(function () { $("div[id^='upload-panel-']").each(function () {
var url = $(this).find('#upload-url').val(); var url = $(this).find('#upload-url').val();
if (url !== '') { if (url !== '') {
var origFile = $(this).find('#upload-title').text();
if (origFile !== null && origFile !== '') {
url += ':' + origFile;
}
allUploads.unshift(url); allUploads.unshift(url);
} }
}); });
if (allUploads.length > 0) { if (allUploads.length > 0) {
var urlList = allUploads.join(); var urlList = allUploads.join();
window.open(createVaultURL + '&urls=' + urlList, '_blank'); window.open(createVaultURL + '&urls=' + encodeURIComponent(urlList), '_blank');
} }
else { else {
window.open(createVaultURL, '_blank'); window.open(createVaultURL, '_blank');

View File

@ -96,10 +96,19 @@ namespace Teknik.Areas.Vault.Controllers
string[] allURLs = urls.Split(','); string[] allURLs = urls.Split(',');
foreach (string url in allURLs) foreach (string url in allURLs)
{ {
if (IsValidItem(type, url)) string[] urlInfo = url.Split(':');
string uploadId = urlInfo[0];
string title = string.Empty;
if (urlInfo.GetUpperBound(0) >= 1)
{
// They also passed in the original filename, so let's use it as our title
title = urlInfo[1];
}
if (IsValidItem(type, uploadId))
{ {
NewVaultItemViewModel item = new NewVaultItemViewModel(); NewVaultItemViewModel item = new NewVaultItemViewModel();
item.url = url; item.title = title;
item.url = uploadId;
item.type = type; item.type = type;
model.items.Add(item); model.items.Add(item);
} }