Przeglądaj źródła

HUE-2746 [fb] Reset search box filter when opening a folder

Fixed also Oozie info page
Enrico Berti 10 lat temu
rodzic
commit
5a9570a

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

@@ -991,6 +991,7 @@ from django.utils.translation import ugettext as _
         if (file.type == "dir") {
           // Reset page number so that we don't hit a page that doesn't exist
           self.targetPageNum(1);
+          self.searchQuery("");
           self.targetPath("${url('filebrowser.views.view', path=urlencode('/'))}" + "." + stripHashes(file.path));
           location.hash = stripHashes(file.path);
         } else {

+ 16 - 8
apps/oozie/src/oozie/templates/dashboard/list_oozie_info.mako

@@ -283,19 +283,27 @@ ${ layout.menubar(section='oozie', dashboard=True) }
       % endfor
     % endfor
 
+    function filterTables(search) {
+      _metadataTable.fnFilter(search);
+      $.each(instrumentationTables, function(index, item){
+        item.fnFilter(search);
+      });
+      $.each(metricsTables, function(index, item){
+        item.fnFilter(search);
+      });
+    }
 
-    $(".searchFilter").keyup(function(){
-        _metadataTable.fnFilter($(this).val());
-        $.each(instrumentationTables, function(index, item){
-          item.fnFilter($(".searchFilter").val());
-        });
-        $.each(metricsTables, function(index, item){
-          item.fnFilter($(".searchFilter").val());
-        });
+    $(".searchFilter").on("keyup", function(){
+      filterTables($(this).val());
     });
 
     $(".dataTables_wrapper").css("min-height","0");
     $(".dataTables_filter").hide();
+
+    $(".nav-tabs a[data-toggle='tab']").on("show", function (e) {
+      $(".searchFilter").val("");
+      filterTables("");
+    });
   });
 </script>