瀏覽代碼

HUE-7256 [fb] Improve UX for compress/extract as batch job

1. Add Tooltip on supported formats '.zip, tar.gz, bz2, bzip2' on extract
2. Right click on archives shouldn't show compress option
krish 8 年之前
父節點
當前提交
1d38458

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

@@ -99,7 +99,7 @@ ${ fb_components.menubar() }
                   <i class="fa fa-fw fa-hdd-o"></i> ${_('Set replication')}
                 </a>
               </li>
-              % if ENABLE_EXTRACT_UPLOADED_ARCHIVE.get() and 'oozie' in apps:
+              % if ENABLE_EXTRACT_UPLOADED_ARCHIVE.get():
                 <li><a href="javascript: void(0)" title="${_('Compress selection into a single archive')}" data-bind="click: function() { setCompressArchiveDefault(); confirmCompressFiles();}, visible: showCompressButton">
                   <i class="fa fa-fw fa-file-archive-o"></i> ${_('Compress')}</a>
                 </li>
@@ -133,7 +133,7 @@ ${ fb_components.menubar() }
               <i class="fa fa-fw fa-play"></i> ${_('Submit')}
             </button>
             % if ENABLE_EXTRACT_UPLOADED_ARCHIVE.get():
-              <button class="btn extractArchiveBtn" title="${_('Extract')}"
+              <button class="btn extractArchiveBtn" title="${_('Extract zip, tar.gz, bz2 or bzip2')}"
                 data-bind="visible: selectedFiles().length == 1 && isArchive(selectedFile().name) && !isS3(), click: confirmExtractArchive">
                 <i class="fa fa-fw fa-file-archive-o"></i> ${_('Extract')}
               </button>

+ 2 - 2
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -603,11 +603,11 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
     </li>
     % if ENABLE_EXTRACT_UPLOADED_ARCHIVE.get():
       <li data-bind="css: {'disabled': ! showCompressButton}">
-        <a href="javascript: void(0)" title="${_('Compress selection into a single archive')}" data-bind="click: function() { if(showCompressButton) { setCompressArchiveDefault(); confirmCompressFiles();}}">
+        <a href="javascript: void(0)" title="${_('Compress selection into a single archive')}" data-bind="click: function() { setCompressArchiveDefault(); confirmCompressFiles();}, visible: showCompressButton">
         <i class="fa fa-fw fa-file-archive-o"></i> ${_('Compress')}</a>
       </li>
       <li data-bind="css: {'disabled': selectedFiles().length != 1 || !isArchive(selectedFile().name) || isS3()}">
-        <a href="javascript: void(0)" title="${_('Extract selected archive')}" data-bind="click: (selectedFiles().length == 1 && isArchive(selectedFile().name) && !isS3()) ? confirmExtractArchive : void(0)">
+        <a href="javascript: void(0)" title="${_('Extract selected archive')}" data-bind="visible: selectedFiles().length == 1 && isArchive(selectedFile().name) && !isS3(), click: confirmExtractArchive">
         <i class="fa fa-fw fa-file-archive-o"></i> ${_('Extract')}</a>
       </li>
     % endif