Skip to content

Commit 106dfa6

Browse files
committed
prepare frontend for trash folder
1 parent 133eb86 commit 106dfa6

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

filemanager/static/filemanager/js/fileManager.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,8 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
10071007
method: "deleteFolderOrFile",
10081008
fileAndFolders: allFilesAndFolders,
10091009
domainRandomSeed: domainRandomSeed,
1010-
domainName: domainName
1010+
domainName: domainName,
1011+
skipTrash: $scope.skipTrash
10111012
};
10121013

10131014

filemanager/templates/filemanager/index.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,11 +405,18 @@ <h5 class="modal-title" >{% trans "Create new file!" %} <img ng-hide="htmlEditor
405405
<div class="modal-content">
406406
<div id="htmlEditorLable" class="modal-header">
407407
<h5 class="modal-title" >{% trans "Confirm Deletion!" %} <img ng-hide="deleteLoading" src="{% static 'filemanager/images/loadingSmall.gif' %}"></h5>
408+
408409
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
409410
<span aria-hidden="true">&times;</span>
410411
</button>
411412
</div>
412413
<div class="modal-body">
414+
<form action="/">
415+
<div class="form-group">
416+
<input ng-model="skipTrash" type="checkbox" value=""> Skip Trash Folder
417+
<small class="form-text text-muted">{% trans "Skip trash and permanently delete this file." %}</small>
418+
</div>
419+
</form>
413420
<p>Are you sure?</p>
414421
</div>
415422
<div class="modal-footer">

0 commit comments

Comments
 (0)