Select "Logout" below if you are ready to end your current session.
diff --git a/templates/webadmin/connections.html b/templates/webadmin/connections.html
index ce23d416..6765c04d 100644
--- a/templates/webadmin/connections.html
+++ b/templates/webadmin/connections.html
@@ -58,7 +58,7 @@
Confirmation required
-
SFTPGo - {{.Version}}
+ SFTPGo Admin - {{.Version}}
{{if .Error}}
diff --git a/templates/webadmin/users.html b/templates/webadmin/users.html
index 5dc0d915..989b71dd 100644
--- a/templates/webadmin/users.html
+++ b/templates/webadmin/users.html
@@ -66,7 +66,7 @@
Confirmation required
Do you want to delete the selected user?
diff --git a/templates/webclient/base.html b/templates/webclient/base.html
index d19e0ba6..aaeb0bd2 100644
--- a/templates/webclient/base.html
+++ b/templates/webclient/base.html
@@ -178,7 +178,7 @@
Select "Logout" below if you are ready to end your current session.
@@ -209,6 +209,10 @@
return '%' + c.charCodeAt(0).toString(16);
});
}
+
+ function replaceSlash(str){
+ return str.replace(/\//g,'\u2215');
+ }
diff --git a/templates/webclient/files.html b/templates/webclient/files.html
index 07e2c31e..35193b65 100644
--- a/templates/webclient/files.html
+++ b/templates/webclient/files.html
@@ -48,6 +48,118 @@
{{end}}
+{{define "dialog"}}
+
+
+
+
+
+
+
+
+
+
+
Do you want to delete the selected item?
+
+
+
+
+{{end}}
+
{{define "extra_js"}}
@@ -159,7 +271,180 @@
}
}
+ function getNameFromTypeName(typeName) {
+ return typeName.split('_').slice(1).join('_');
+ }
+
+ function getTypeFromTypeName(typeName) {
+ return typeName.split('_')[0];
+ }
+
+ function deleteAction() {
+ var table = $('#dataTable').DataTable();
+ table.button('delete:name').enable(false);
+ var selected = table.column(0).checkboxes.selected()[0];
+ var itemType = getTypeFromTypeName(selected);
+ var itemName = getNameFromTypeName(selected);
+ var path;
+ if (itemType == "1"){
+ path = '{{.DirsURL}}';
+ } else {
+ path = '{{.FilesURL}}';
+ }
+ path+='?path={{.CurrentDir}}'+fixedEncodeURIComponent("/"+itemName);
+ $('#deleteModal').modal('hide');
+ $.ajax({
+ url: path,
+ type: 'DELETE',
+ dataType: 'json',
+ headers: { 'X-CSRF-TOKEN': '{{.CSRFToken}}' },
+ timeout: 15000,
+ success: function (result) {
+ location.reload();
+ },
+ error: function ($xhr, textStatus, errorThrown) {
+ var txt = "Unable to delete the selected item";
+ if ($xhr) {
+ var json = $xhr.responseJSON;
+ if (json) {
+ if (json.message) {
+ txt = json.message;
+ }
+ if (json.error) {
+ txt += ": " + json.error;
+ }
+ }
+ }
+ $('#errorTxt').text(txt);
+ $('#errorMsg').show();
+ setTimeout(function () {
+ $('#errorMsg').hide();
+ }, 5000);
+ }
+ });
+ }
+
$(document).ready(function () {
+ $("#create_dir_form").submit(function (event) {
+ event.preventDefault();
+ $('#createDirModal').modal('hide');
+ var dirName = replaceSlash($("#directory_name").val());
+ var path = '{{.DirsURL}}?path={{.CurrentDir}}' + fixedEncodeURIComponent("/"+dirName);
+ $.ajax({
+ url: path,
+ type: 'POST',
+ dataType: 'json',
+ headers: { 'X-CSRF-TOKEN': '{{.CSRFToken}}' },
+ timeout: 15000,
+ success: function (result) {
+ location.reload();
+ },
+ error: function ($xhr, textStatus, errorThrown) {
+ var txt = "Unable to create the requested directory";
+ if ($xhr) {
+ var json = $xhr.responseJSON;
+ if (json) {
+ if (json.message) {
+ txt = json.message;
+ }
+ if (json.error) {
+ txt += ": " + json.error;
+ }
+ }
+ }
+ $('#errorTxt').text(txt);
+ $('#errorMsg').show();
+ setTimeout(function () {
+ $('#errorMsg').hide();
+ }, 5000);
+ }
+ });
+ });
+
+ $("#upload_files_form").submit(function (event){
+ event.preventDefault();
+ $('uploadFilesModal').modal('hide');
+ var path = '{{.FilesURL}}?path={{.CurrentDir}}';
+ $.ajax({
+ url: path,
+ type: 'POST',
+ data: new FormData(this),
+ processData: false,
+ contentType: false,
+ headers: { 'X-CSRF-TOKEN': '{{.CSRFToken}}' },
+ timeout: 15000,
+ success: function (result) {
+ location.reload();
+ },
+ error: function ($xhr, textStatus, errorThrown) {
+ var txt = "Error uploading files";
+ if ($xhr) {
+ var json = $xhr.responseJSON;
+ if (json) {
+ if (json.message) {
+ txt = json.message;
+ }
+ if (json.error) {
+ txt += ": " + json.error;
+ }
+ }
+ }
+ $('#errorTxt').text(txt);
+ $('#errorMsg').show();
+ setTimeout(function () {
+ $('#errorMsg').hide();
+ }, 5000);
+ }
+ });
+ });
+
+ $("#rename_form").submit(function (event){
+ event.preventDefault();
+ var table = $('#dataTable').DataTable();
+ table.button('rename:name').enable(false);
+ var selected = table.column(0).checkboxes.selected()[0];
+ var itemType = getTypeFromTypeName(selected);
+ var itemName = getNameFromTypeName(selected);
+ var targetName = replaceSlash($("#rename_new_name").val());
+ var path;
+ if (itemType == "1"){
+ path = '{{.DirsURL}}';
+ } else {
+ path = '{{.FilesURL}}';
+ }
+ path+='?path={{.CurrentDir}}'+fixedEncodeURIComponent("/"+itemName)+'&target={{.CurrentDir}}'+fixedEncodeURIComponent("/"+targetName);
+ $('renameModal').modal('hide');
+ $.ajax({
+ url: path,
+ type: 'PATCH',
+ dataType: 'json',
+ headers: { 'X-CSRF-TOKEN': '{{.CSRFToken}}' },
+ timeout: 15000,
+ success: function (result) {
+ location.reload();
+ },
+ error: function ($xhr, textStatus, errorThrown) {
+ var txt = "Error renaming item";
+ if ($xhr) {
+ var json = $xhr.responseJSON;
+ if (json) {
+ if (json.message) {
+ txt = json.message;
+ }
+ if (json.error) {
+ txt += ": " + json.error;
+ }
+ }
+ }
+ $('#errorTxt').text(txt);
+ $('#errorMsg').show();
+ setTimeout(function () {
+ $('#errorMsg').hide();
+ }, 5000);
+ }
+ });
+ });
+
$.fn.dataTable.ext.buttons.refresh = {
text: '
',
name: 'refresh',
@@ -177,7 +462,7 @@
var filesArray = [];
var selected = dt.column(0).checkboxes.selected();
for (i = 0; i < selected.length; i++) {
- filesArray.push(selected[i]);
+ filesArray.push(getNameFromTypeName(selected[i]));
}
var files = fixedEncodeURIComponent(JSON.stringify(filesArray));
var downloadURL = '{{.DownloadURL}}';
@@ -187,9 +472,54 @@
enabled: false
};
+ $.fn.dataTable.ext.buttons.addFiles = {
+ text: '
',
+ name: 'addFiles',
+ titleAttr: "Upload files",
+ action: function (e, dt, node, config) {
+ $('#uploadFilesModal').modal('show');
+ },
+ enabled: true
+ };
+
+ $.fn.dataTable.ext.buttons.addDirectory = {
+ text: '
',
+ name: 'addDirectory',
+ titleAttr: "Add directory",
+ action: function (e, dt, node, config) {
+ $("#directory_name").val("");
+ $('#createDirModal').modal('show');
+ },
+ enabled: true
+ };
+
+ $.fn.dataTable.ext.buttons.rename = {
+ text: '
',
+ name: 'rename',
+ titleAttr: "Rename",
+ action: function (e, dt, node, config) {
+ var selected = table.column(0).checkboxes.selected()[0];
+ var itemName = getNameFromTypeName(selected);
+ $("#rename_old_name").val(itemName);
+ $("#rename_new_name").val("");
+ $('#renameModal').modal('show');
+ },
+ enabled: false
+ };
+
+ $.fn.dataTable.ext.buttons.delete = {
+ text: '
',
+ name: 'delete',
+ titleAttr: "Delete",
+ action: function (e, dt, node, config) {
+ $('#deleteModal').modal('show');
+ },
+ enabled: false
+ };
+
var table = $('#dataTable').DataTable({
"ajax": {
- "url": "{{.ReadDirURL}}?path={{.CurrentDir}}",
+ "url": "{{.DirsURL}}?path={{.CurrentDir}}",
"dataSrc": "",
"error": function ($xhr, textStatus, errorThrown) {
$(".dataTables_processing").hide();
@@ -214,7 +544,7 @@
"deferRender": true,
"processing": true,
"columns": [
- { "data": "name" },
+ { "data": "type_name" },
{ "data": "type" },
{
"data": "name",
@@ -250,6 +580,12 @@
selectedText = `${selectedItems} items selected`;
}
table.button('download:name').enable(selectedItems > 0);
+ {{if .CanRename}}
+ table.button('rename:name').enable(selectedItems == 1);
+ {{end}}
+ {{if .CanDelete}}
+ table.button('delete:name').enable(selectedItems == 1);
+ {{end}}
$('#dataTable_info').find('span').remove();
$("#dataTable_info").append('
' + selectedText + '');
}
@@ -279,6 +615,18 @@
table.button().add(0, 'refresh');
table.button().add(0, 'pageLength');
table.button().add(0, 'download');
+ {{if .CanDelete}}
+ table.button().add(0, 'delete');
+ {{end}}
+ {{if .CanRename}}
+ table.button().add(0, 'rename');
+ {{end}}
+ {{if .CanCreateDirs}}
+ table.button().add(0, 'addDirectory');
+ {{end}}
+ {{if .CanAddFiles}}
+ table.button().add(0, 'addFiles');
+ {{end}}
table.buttons().container().appendTo('#dataTable_wrapper .col-md-6:eq(0)');
},
"orderFixed": [1, 'asc'],