django-cards 0.11.4__tar.gz → 0.11.7__tar.gz

{django-cards-0.11.4/django_cards.egg-info → django-cards-0.11.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.11.4
+Version: 0.11.7
 Summary: Django app that allows you make cards
 Home-page: https://github.com/django-advance-utils/django-cards
 Author: Thomas Turner

{django-cards-0.11.4 → django-cards-0.11.7}/cards/base.py

@@ -6,6 +6,7 @@ from ajax_helpers.utils import random_string
 from django.core.exceptions import FieldDoesNotExist
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
+from django.utils.text import slugify
 from django_datatables.datatables import DatatableTable
 from django_datatables.plugins.reorder import Reorder
 from django_datatables.reorder_datatable import OrderedDatatable
@@ -82,10 +83,14 @@ class CardBase:
                  menu=None, tab_menu=None, template_name=None, call_details_data=False,
                  group_type=CARD_TYPE_STANDARD, show_created_modified_dates=False,
                  footer=None, extra_card_context=None,
-                 is_empty=False, empty_template_name=None, empty_message='N/A', collapsed=None, **kwargs):
+                 is_empty=False, empty_template_name=None, empty_message='N/A',
+                 collapsed=None, hidden_if_blank_or_none=None, **kwargs):
 
         if code is None:
-            code = random_string()
+            if title is not None:
+                code = slugify(title).replace('-', '_') + '_card'
+            else:
+                code = random_string()
 
         self.code = code
         self.view = view
@@ -98,7 +103,10 @@ class CardBase:
         self.rows = []
         self._row_styles = {}
         self._default_row_styles = None
-        self.title = title
+        if title is not None:
+            self.title = mark_safe(title)
+        else:
+            self.title = None
         self.created_modified_dates = self.get_created_modified_dates(details_object=details_object)
         if isinstance(menu, (list, tuple)):
             menu = HtmlMenu(self.request, self.button_menu_type).add_items(*menu)
@@ -109,6 +117,7 @@ class CardBase:
         self.call_details_data = call_details_data
         self.enable_collapse = collapsed is not None
         self.collapsed = collapsed
+        self.hidden_if_blank_or_none = hidden_if_blank_or_none
 
         if is_empty:
             self.group_type = CARD_TYPE_STANDARD
@@ -211,7 +220,7 @@ class CardBase:
             self.rows.append(row)
 
     def add_entry(self, value=None, field=None, label=None, entry_css_class=None, css_class=None,
-                  default='N/A', link=None,  hidden=False, hidden_if_blank_or_none=False,
+                  default='N/A', link=None,  hidden=False, hidden_if_blank_or_none=None,
                   html_override=None, value_method=None, value_type=None, default_if=None, row_style=None, **kwargs):
 
         entry = self._add_entry_internal(value=value,
@@ -328,13 +337,16 @@ class CardBase:
                                         **kwargs)
 
     def _add_entry_internal(self, value=None, field=None, label=None, default='N/A', link=None,
-                            hidden=False, hidden_if_blank_or_none=False, html_override=None,
+                            hidden=False, hidden_if_blank_or_none=None, html_override=None,
                             value_method=None, value_type=None,
                             entry_css_class=None, css_class=None, menu=None, default_if=None, row_style=None,
                             **kwargs):
 
         value, label, field_type = self.get_field_value(value=value, field=field, label=label)
 
+        if hidden_if_blank_or_none is None:
+            hidden_if_blank_or_none = self.hidden_if_blank_or_none
+
         if hidden or (hidden_if_blank_or_none and (value is None or value == '')):
             return None
         if isinstance(value, bool):

{django-cards-0.11.4 → django-cards-0.11.7/django_cards.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.11.4
+Version: 0.11.7
 Summary: Django app that allows you make cards
 Home-page: https://github.com/django-advance-utils/django-cards
 Author: Thomas Turner

{django-cards-0.11.4 → django-cards-0.11.7}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="django-cards",
-    version="0.11.4",
+    version="0.11.7",
     author="Thomas Turner",
     description="Django app that allows you make cards",
     long_description=long_description,