django-cards 0.11.3__tar.gz → 0.11.6__tar.gz

{django-cards-0.11.3/django_cards.egg-info → django-cards-0.11.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.11.3
+Version: 0.11.6
 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.3 → django-cards-0.11.6}/cards/base.py

@@ -82,7 +82,8 @@ 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()
@@ -98,7 +99,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 +113,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 +216,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 +333,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.3 → django-cards-0.11.6}/cards/card_list/main.py

@@ -20,7 +20,8 @@ class CardListMixin(CardListBaseMixin):
 
     model = None
 
-    def add_list_card(self):
+    def setup_cards(self):
+
         list_menu = self.get_list_menu()
         selected_id = self.slug.get('pk')
         self.display_list_entries()
@@ -32,22 +33,14 @@ class CardListMixin(CardListBaseMixin):
         if selected_id:
             selected_id = int(selected_id)
 
-        context = {'list_title': self.list_title,
-                   'entries': self.list_entries,
-                   'selected_id': selected_id,
-                   'empty_list_message': self.empty_list_message(),
-                   'details_button_action_name': 'details_html',
-                   'details_empty_button_action_name': 'empty_details_html'}
+        self.add_list_card(card_name='list_card',
+                           list_entries=self.list_entries,
+                           list_title=self.list_title,
+                           selected_id=selected_id,
+                           list_menu=list_menu,
+                           list_template_name=self.list_template_name,
+                           empty_list_message=self.empty_list_message())
 
-        self.add_card('list_card',
-                      title=self.list_title,
-                      menu=list_menu,
-                      group_type=CARD_TYPE_HTML,
-                      template_name=self.list_template_name,
-                      extra_card_context=context)
-
-    def setup_cards(self):
-        self.add_list_card()
         self.add_card('details_card',
                       group_type=CARD_TYPE_HTML,
                       template_name='blank',

{django-cards-0.11.3 → django-cards-0.11.6}/cards/standard.py

@@ -91,6 +91,29 @@ class CardMixin:
         return self.add_card(card_name=card_name,
                              group_type=CARD_TYPE_CARD_LAYOUT)
 
+
+    def add_list_card(self, list_entries, card_name=None, list_title='Entries',
+                      selected_id='', list_menu=None, list_template_name='list_selection',
+                      empty_list_message='No entries setup yet!',
+                      extra_card_context=None):
+
+        context = {'list_title': list_title,
+                   'entries': list_entries,
+                   'selected_id': selected_id,
+                   'empty_list_message': empty_list_message,
+                   'details_button_action_name': 'details_html',
+                   'details_empty_button_action_name': 'empty_details_html'}
+        if extra_card_context is not None:
+            context.update(extra_card_context)
+
+        card = self.add_card(card_name=card_name,
+                             title=list_title,
+                             menu=list_menu,
+                             group_type=CARD_TYPE_HTML,
+                             template_name=list_template_name,
+                             extra_card_context=context)
+        return card
+
     def get_context_data(self, **kwargs):
         self.setup_datatable_cards()
         self.setup_cards()

{django-cards-0.11.3 → django-cards-0.11.6/django_cards.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.11.3
+Version: 0.11.6
 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.3 → django-cards-0.11.6}/setup.py

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