Skip to content

Commit

Permalink
prepare frontend for trash folder
Browse files Browse the repository at this point in the history
  • Loading branch information
usmannasir committed Aug 4, 2020
1 parent 133eb86 commit 106dfa6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
3 changes: 2 additions & 1 deletion filemanager/static/filemanager/js/fileManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,8 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
method: "deleteFolderOrFile",
fileAndFolders: allFilesAndFolders,
domainRandomSeed: domainRandomSeed,
domainName: domainName
domainName: domainName,
skipTrash: $scope.skipTrash
};


Expand Down
7 changes: 7 additions & 0 deletions filemanager/templates/filemanager/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,18 @@ <h5 class="modal-title" >{% trans "Create new file!" %} <img ng-hide="htmlEditor
<div class="modal-content">
<div id="htmlEditorLable" class="modal-header">
<h5 class="modal-title" >{% trans "Confirm Deletion!" %} <img ng-hide="deleteLoading" src="{% static 'filemanager/images/loadingSmall.gif' %}"></h5>

<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form action="/">
<div class="form-group">
<input ng-model="skipTrash" type="checkbox" value=""> Skip Trash Folder
<small class="form-text text-muted">{% trans "Skip trash and permanently delete this file." %}</small>
</div>
</form>
<p>Are you sure?</p>
</div>
<div class="modal-footer">
Expand Down

0 comments on commit 106dfa6

Please sign in to comment.