another minor grid refactoring

Author: mdipierro

py4web/utils/grid.py

@@ -56,8 +56,7 @@ def query_join(a, b):
 
 
 def make_default_search_query(table):
-    builder = QueryBuilder()
-    return ["Query", (lambda text, table=table: builder.parse(table, text)), None]
+    return ["Query", lambda text, table=table: QueryBuilder().parse(table, text), None]
 
 
 class GridClassStyle:
@@ -500,8 +499,7 @@ def __init__(
 
         #  instance variables that will be computed
         self.db = query._db  # the database
-        self.query_init = query  # the filter query
-        self.query = query  # the query with additional filters
+        self.query = query  # the filter query
         self.query_parms = safely(lambda: request.params, default={})
         self.search_query_error = None  # error to be displayed in case failed search
         self.T = T  # the translator
@@ -592,25 +590,7 @@ def process(self):
         # SECURITY: if the record does not exist or does not match query, than we are not allowed
         self.table = db[self.tablename]
 
-        # use the default search for the table
-        if self.param.search_queries is None:
-            self.param.search_queries = [make_default_search_query(self.table)]
-
-        # apply the search query
-        if not self.param.search_form and self.param.search_queries:
-            search_type = safe_int(request.query.get("search_type", 0), default=0)
-            search_string = request.query.get("search_string")
-            if search_type < len(self.param.search_queries) and search_string:
-                _, query_lambda, requires = self.param.search_queries[search_type]
-                if requires:
-                    search_string, self.search_query_error = requires(search_string)
-                if not self.search_query_error:
-                    try:
-                        query = query_lambda(search_string)
-                        self.query = self.query_init & query
-                    except Exception as e:
-                        self.search_query_error = str(e)
-
+        # if we have a record id retrieve the record
         if self.record_id:
             self.record = self.table(self.record_id)
             if not self.record:
@@ -696,6 +676,27 @@ def _handle_redirect_to_referrer(self, inject_back, redirect_on_post):
 
     def _handle_mode_select(self):
         db = self.db
+
+        # use the default search for the table
+        if self.param.search_queries is None:
+            self.param.search_queries = [make_default_search_query(self.table)]
+
+        query = self.query
+
+        # apply the search query
+        if not self.param.search_form and self.param.search_queries:
+            search_type = safe_int(request.query.get("search_type", 0), default=0)
+            search_string = request.query.get("search_string")
+            if search_type < len(self.param.search_queries) and search_string:
+                _, query_lambda, requires = self.param.search_queries[search_type]
+                if requires:
+                    search_string, self.search_query_error = requires(search_string)
+                if not self.search_query_error:
+                    try:
+                        query = self.query & query_lambda(search_string)
+                    except Exception as e:
+                        self.search_query_error = str(e)
+
         # if no column specified use all fields
         if not self.param.columns:
             self.param.columns = [field for field in self.table if field.readable]
@@ -798,10 +799,10 @@ def compute(row, name=str(col)):
         if self.param.groupby or self.param.left:
             #  need groupby fields in select to get proper count
             self.total_number_of_rows = len(
-                db(self.query).select(db[self.tablename]._id, **select_params)
+                db(query).select(db[self.tablename]._id, **select_params)
             )
         else:
-            self.total_number_of_rows = db(self.query).count()
+            self.total_number_of_rows = db(query).count()
 
         #  if at a high page number and then filter causes less records to be displayed, reset to page 1
         if (
@@ -820,7 +821,7 @@ def compute(row, name=str(col)):
             self.page_end = self.total_number_of_rows
 
         # get the data
-        self.rows = db(self.query).select(*self.needed_fields, **select_params)
+        self.rows = db(query).select(*self.needed_fields, **select_params)
 
         self.number_of_pages = self.total_number_of_rows // self.param.rows_per_page
         if self.total_number_of_rows % self.param.rows_per_page > 0: