Преглед изворни кода

HUE-4531 [fb] Enable deleting buckets on S3

Enrico Berti пре 9 година
родитељ
комит
f232d86

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/listdir.mako

@@ -90,7 +90,7 @@ ${ fb_components.menubar() }
           <button class="btn fileToolbarBtn" title="${_('Restore from trash')}" data-bind="visible: inRestorableTrash(), click: restoreTrashSelected, enable: selectedFiles().length > 0 && isCurrentDirSelected().length == 0"><i class="fa fa-cloud-upload"></i> ${_('Restore')}</button>
           <!-- ko ifnot: inTrash -->
           <!-- ko if: $root.isS3 -->
-          <button class="btn fileToolbarBtn delete-link" title="${_('Delete forever')}" data-bind="enable: selectedFiles().length > 0 && (!isS3() || (isS3() && !isS3Root())), click: deleteSelected"><i class="fa fa-bolt"></i> ${_('Delete forever')}</button>
+          <button class="btn fileToolbarBtn delete-link" title="${_('Delete forever')}" data-bind="enable: selectedFiles().length > 0, click: deleteSelected"><i class="fa fa-bolt"></i> ${_('Delete forever')}</button>
           <!-- /ko -->
           <!-- ko ifnot: $root.isS3 -->
           <div id="delete-dropdown" class="btn-group" style="vertical-align: middle">

+ 6 - 0
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -103,7 +103,13 @@ from django.utils.translation import ugettext as _
       <h3>${_('Confirm Delete')}</h3>
     </div>
     <div class="modal-body">
+      <!-- ko if: isS3() && isS3Root() -->
+      <p>${_('Are you sure you want to delete these buckets?')}</p>
+      <p class="muted">${_('Deleting a bucket will delete all of its contents and release the bucket name to be reserved by others.')}</p>
+      <!-- /ko -->
+      <!-- ko ifnot: isS3() && isS3Root() -->
       <p>${_('Are you sure you want to delete these files?')}</p>
+      <!-- /ko -->
     </div>
     <div class="modal-footer">
       <form id="deleteForm" action="/filebrowser/rmtree" method="POST" enctype="multipart/form-data" class="form-stacked">