Ver código fonte

HUE-2384 [fb] Send to trash root when deleting trash

Updated redirect URL: after emptying trash, users are redirected to trash root directory
Added home directory to view model
Paul McCaughtry 11 anos atrás
pai
commit
f1219a06cc

+ 3 - 1
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -708,6 +708,8 @@ from django.utils.translation import ugettext as _
       }));
       self.files.sort(self.filesSorting)
 
+      self.homeDir = ko.observable("${home_directory}");
+
       self.breadcrumbs = ko.observableArray(ko.utils.arrayMap(breadcrumbs, function (breadcrumb) {
         return new Breadcrumb(breadcrumb);
       }));
@@ -1132,7 +1134,7 @@ from django.utils.translation import ugettext as _
 
         hiddenFields($("#purgeTrashForm"), 'path', paths);
 
-        $("#purgeTrashForm").attr("action", "/filebrowser/trash/purge?next=${url('filebrowser.views.view', path=urlencode('/'))}" + "." + self.currentPath());
+        $("#purgeTrashForm").attr("action", "/filebrowser/trash/purge?next=${url('filebrowser.views.view', path=urlencode('/'))}" + viewModel.homeDir().slice(1) + "/.Trash");
 
         $("#purgeTrashModal").modal({
           keyboard:true,