Merge pull request #2435 from Martchus/enable-regex-in-all-admin-tables

Enable regex search in 'Medium types' table
os-autoinst · Oct 25, 2019 · 8c3a5ec · 8c3a5ec
2 parents 5e4e901 + f90c607
commit 8c3a5ec
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/assets/javascripts/admintable.js b/assets/javascripts/admintable.js
@@ -353,7 +353,7 @@ function renderEditableAdminTableActions(data, type, row, meta) {
     }
 }
 
-function setupAdminTable(isAdmin, enableRegexForFiltering) {
+function setupAdminTable(isAdmin) {
     // adjust sorting so empty strings come last
     jQuery.extend(jQuery.fn.dataTableExt.oSort, {
         'empty-string-last-asc': function(str1, str2) {
@@ -439,7 +439,7 @@ function setupAdminTable(isAdmin, enableRegexForFiltering) {
         columns: columns,
         columnDefs: columnDefs,
         search: {
-            regex: enableRegexForFiltering,
+            regex: true,
         },
     });
     dataTable.rowData = [];

diff --git a/templates/admin/machine/index.html.ep b/templates/admin/machine/index.html.ep
@@ -2,7 +2,7 @@
 % title 'Machines';
 
 % content_for 'ready_function' => begin
-    setupAdminTable(<%= is_admin_js %>, true);
+    setupAdminTable(<%= is_admin_js %>);
 % end
 
 <div class="row">

diff --git a/templates/admin/product/index.html.ep b/templates/admin/product/index.html.ep
@@ -2,7 +2,7 @@
 % title 'Medium types';
 
 % content_for 'ready_function' => begin
-   setupAdminTable(<%= is_admin_js %>, false);
+   setupAdminTable(<%= is_admin_js %>);
 % end
 
 <div class="row">

diff --git a/templates/admin/test_suite/index.html.ep b/templates/admin/test_suite/index.html.ep
@@ -2,7 +2,7 @@
 % title 'Test suites';
 
 % content_for 'ready_function' => begin
-    setupAdminTable(<%= is_admin_js %>, true);
+    setupAdminTable(<%= is_admin_js %>);
 % end
 
 <div class="row">