cleaner function to check is relation field

Author: mchoopani

django_dyn_dt/templates/index.html

@@ -7,7 +7,7 @@
 
     <!-- data-tables -->
     <link href="https://cdn.jsdelivr.net/npm/simple-datatables@latest/dist/style.css" rel="stylesheet" type="text/css">
-    <script src="https://cdn.jsdelivr.net/npm/simple-datatables@latest"               type="text/javascript"></script>
+    <script src="https://cdn.jsdelivr.net/npm/simple-datatables@3.2.0"               type="text/javascript"></script>
 
     <!-- bootstrap5 -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">

django_dyn_dt/templates/static/src/controller/index.js

@@ -155,11 +155,11 @@ export const columnsManage = (dataTable) => {
 
             const id = myData.headings.indexOf(e.target.closest('input').id)
             if (e.target.closest('input').checked) {
-                dataTable.columns.hide([parseInt(id)])
+                dataTable.columns().hide([parseInt(id)])
                 const hideColumns = JSON.parse(localStorage.getItem('hideColumns')) || []
                 localStorage.setItem('hideColumns' , JSON.stringify([...hideColumns , e.target.closest('input').id]))
             } else {
-                dataTable.columns.show([parseInt(id)])
+                dataTable.columns().show([parseInt(id)])
                 const hideColumns = JSON.parse(localStorage.getItem('hideColumns')) || []
                 localStorage.setItem('hideColumns' , JSON.stringify(hideColumns.filter(d => d !== e.target.closest('input').id)))
             }

django_dyn_dt/templates/static/src/index.js

@@ -39,7 +39,7 @@ myData.data.forEach((d,i) => {
     newColumn.push(editBtn + "   " + removeBtn)
 })
         // add buttons
-dataTable.columns.add({
+dataTable.columns().add({
     heading: '',
     data: newColumn
 })
@@ -66,7 +66,7 @@ window.onload = () => {
 
     const hideColumns = JSON.parse(localStorage.getItem('hideColumns'))
     hideColumns.forEach(d => {
-        dataTable.columns.hide([myData.headings.indexOf(d)])
+        dataTable.columns().hide([myData.headings.indexOf(d)])
     })
 
     const els = document.getElementsByClassName('form-check-input')

django_dyn_dt/views.py

@@ -234,13 +234,14 @@ def get_random_string(length):
 def _get_headings(model_class, filter_relations=True):
     headings = []
     for field in model_class._meta.get_fields():
-        field_dict = field.__dict__
-        is_many_to_many_field = field_dict.get('many_to_many', False)
-        is_many_to_one_field = field_dict.get('many_to_one', False)
-        is_one_to_many_field = field_dict.get('one_to_many', False)
-        is_one_to_one_field = field_dict.get('one_to_one', False)
-        if filter_relations and (
-                is_many_to_many_field or is_many_to_one_field or is_one_to_many_field or is_one_to_one_field):
+        if filter_relations and _is_relation_field(field):
             continue
         headings.append(field.name)
     return headings
+
+def _is_relation_field(field):
+    is_many_to_many_field = field.many_to_many is not None
+    is_many_to_one_field = field.many_to_one is not None
+    is_one_to_many_field = field.one_to_many is not None
+    is_one_to_one_field = field.one_to_one is not None
+    return is_many_to_many_field or is_many_to_one_field or is_one_to_many_field or is_one_to_one_field