feat: Refactor delete query handling in BaseView and comment out checkbox logic in DeTable

opensipkd/base/views/base_views.py

@@ -1121,8 +1121,8 @@ class BaseView(object):
         
         
         q = self.query_id()
         q = self.query_id()
         if self.allow_check:
         if self.allow_check:
-            rcount = q.count()
-            if rcount > 1:
+            q=self.query_delete()
+            rcount=q.count()
             try:
             try:
                 q.delete(synchronize_session='fetch')
                 q.delete(synchronize_session='fetch')
                 self.db_session.flush()
                 self.db_session.flush()
@@ -1165,13 +1165,18 @@ class BaseView(object):
         kwargs["table"] = table
         kwargs["table"] = table
         return self.returned_form(form, **kwargs)
         return self.returned_form(form, **kwargs)
     
     
-    def query_id(self, id_=None):
-        id_ = id_ or self.req.matchdict['id']
-        if id_=='all':
+    def query_delete(self):
+        id_ = self.req.matchdict['id']
+        if id_ == 'all':
             ids_ = [int(i) for i in self.req.params.get("ids").split(",")]
             ids_ = [int(i) for i in self.req.params.get("ids").split(",")]
             return self.table.query().filter(self.table.id.in_(ids_))
             return self.table.query().filter(self.table.id.in_(ids_))
         return self.table.query_id(id_)
         return self.table.query_id(id_)
 
 
+
+    def query_id(self, id_=None):
+        id_ = id_ or self.req.matchdict['id']
+        return self.table.query_id(id_)
+
         # if self.req.user:
         # if self.req.user:
         #     if hasattr(self.table, 'company_id') and self.req.user.company_id:
         #     if hasattr(self.table, 'company_id') and self.req.user.company_id:
         #         q = q.filter_by(company_id=self.req.user.company_id)
         #         q = q.filter_by(company_id=self.req.user.company_id)

opensipkd/detable/detable.py

@@ -225,11 +225,11 @@ class DeTable(field.Field):
                     """
                     """
             header_buttons.insert(0, button)
             header_buttons.insert(0, button)
         edit_buttons = []
         edit_buttons = []
-        if allow_check:
-            button = f"""
-            <input type="checkbox" class="{tableid}checkAll form-control"> All</input>
-            """
-            edit_buttons.append(button)
+        # if allow_check:
+        #     button = f"""
+        #     <input type="checkbox" class="{tableid}checkAll form-control"> All</input>
+        #     """
+        #     edit_buttons.append(button)
 
 
         self.buttons = "','".join(header_buttons).replace('\n', ""). \
         self.buttons = "','".join(header_buttons).replace('\n', ""). \
             replace(';', ';\n')
             replace(';', ';\n')