From 60d0f6523162aa915fb5a9211fe89c144a20357e Mon Sep 17 00:00:00 2001 From: Dmitriy Sintsov Date: Mon, 16 Nov 2015 15:22:48 +0300 Subject: [PATCH] forms.UnchangableModelMixin is used in DisplayModelMetaclass to set form.has_changed() result to False. bs_breadcrumbs() Jinja2 macro offers optional title kwarg. bs_inline_formsets() Jinja2 macro now offers caller() sections for begin / end of each formset / form in formset. models.get_verbose_name() now supports foreign key fields specified as strings like 'action__type'. common.css support to highlight current hash as id of element. Better naming for conditional display css classes. Support for bs_breadcrumbs() title kwarg in views.ListSortingView. --- django_jinja_knockout/forms.py | 8 ++++++++ django_jinja_knockout/jinja2/bs_breadcrumbs.htm | 5 ++++- django_jinja_knockout/jinja2/bs_inline_formsets.htm | 5 ++++- django_jinja_knockout/models.py | 11 +++++++---- django_jinja_knockout/static/css/front/common.css | 9 +++++++-- django_jinja_knockout/views.py | 2 ++ 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/django_jinja_knockout/forms.py b/django_jinja_knockout/forms.py index 791969dc..1251d36e 100644 --- a/django_jinja_knockout/forms.py +++ b/django_jinja_knockout/forms.py @@ -35,11 +35,19 @@ def display_model_formfield_callback(db_field, **kwargs): return db_field.formfield(**defaults) +class UnchangableModelMixin(): + + def has_changed(self): + # Display forms never change. + return False + + # Metaclass used to create read-only forms (display models). # class DisplayModelMetaclass(ModelFormMetaclass): def __new__(mcs, name, bases, attrs): if attrs is None: attrs = {} + bases = bases + (UnchangableModelMixin,) attrs.update({'formfield_callback': display_model_formfield_callback}) return ModelFormMetaclass.__new__(mcs, name, bases, attrs) diff --git a/django_jinja_knockout/jinja2/bs_breadcrumbs.htm b/django_jinja_knockout/jinja2/bs_breadcrumbs.htm index 556f1b0c..9119c028 100644 --- a/django_jinja_knockout/jinja2/bs_breadcrumbs.htm +++ b/django_jinja_knockout/jinja2/bs_breadcrumbs.htm @@ -1,5 +1,8 @@ -{% macro bs_breadcrumbs(navs) -%} +{% macro bs_breadcrumbs(title=None, navs) -%}
    + {% if title is not none %} +
  1. {{ title }}:
    2. + {% endif %} {% for nav in navs %}
  2. {% if nav.class != 'active' %}{% endif %} diff --git a/django_jinja_knockout/jinja2/bs_inline_formsets.htm b/django_jinja_knockout/jinja2/bs_inline_formsets.htm index 3827dbe0..caebe7be 100644 --- a/django_jinja_knockout/jinja2/bs_inline_formsets.htm +++ b/django_jinja_knockout/jinja2/bs_inline_formsets.htm @@ -22,6 +22,7 @@ {% endif %} {% for formset in formsets %} + {{ caller(formset_begin=formset) }}
    {{ formset.management_form }} @@ -38,6 +39,7 @@ {% endif %} {% for form in formset %} + {{ caller(form_begin=form) }} {% set formset_index = loop.index0 %} {% if formset.can_delete %} {% if formset_index < formset.min_num %} @@ -47,6 +49,7 @@ {% endif %} {% endif %} {% include 'bs_formset_form.htm' %} + {{ caller(form_end=form) }} {% endfor %} {% if action == '' %}
    @@ -58,7 +61,7 @@ {% endif %}
    - {{ caller(formset.prefix) }} + {{ caller(formset_end=formset) }} {% endfor %} {% if html.submit_text != '' %} diff --git a/django_jinja_knockout/models.py b/django_jinja_knockout/models.py index 1c584d6f..6c64a6c8 100644 --- a/django_jinja_knockout/models.py +++ b/django_jinja_knockout/models.py @@ -2,10 +2,13 @@ def get_verbose_name(obj, fieldname): if type(obj) is str: - Model = apps.get_model(*obj.split('.')) - return Model._meta.get_field_by_name(fieldname)[0].verbose_name - else: - return obj._meta.get_field_by_name(fieldname)[0].verbose_name + obj = apps.get_model(*obj.split('.')) + fieldpath = fieldname.split('__') + if len(fieldpath) > 1: + fieldname = fieldpath.pop() + for _fieldname in fieldpath: + obj = obj._meta.get_field(_fieldname).rel.to + return obj._meta.get_field_by_name(fieldname)[0].verbose_name class ContentTypeLinker(object): diff --git a/django_jinja_knockout/static/css/front/common.css b/django_jinja_knockout/static/css/front/common.css index b2c01377..66380cf6 100644 --- a/django_jinja_knockout/static/css/front/common.css +++ b/django_jinja_knockout/static/css/front/common.css @@ -23,6 +23,11 @@ font-weight: 800; } +.href-target:target { + border: 2px solid Aquamarine; + background-color: Aquamarine; +} + .vscroll, .bootstrap-dialog-message { max-height: 500px; @@ -122,12 +127,12 @@ textarea.ko-template { visibility: hidden; } -.display-block .conditional-display { +.display-block-condition .conditional-display { display: block; margin: 0.25em 0 0.25em 0; } -.display-inline .conditional-display { +.display-inline-condition .conditional-display { display: inline-block; margin: 0 0.25em 0 0.25em; } diff --git a/django_jinja_knockout/views.py b/django_jinja_knockout/views.py index c9316338..a7f67369 100644 --- a/django_jinja_knockout/views.py +++ b/django_jinja_knockout/views.py @@ -365,10 +365,12 @@ def get_context_data(self, **kwargs): context_data = super().get_context_data(**kwargs) context_data.update({ 'cbv': self, + 'filter_title': {}, 'filter_navs': {}, 'filter_display': {} }) for fieldname in self.__class__.allowed_filter_fields: + context_data['filter_title'][fieldname] = get_verbose_name(self.__class__.model, fieldname) navs, display = self.get_filter_navs(fieldname) context_data['filter_navs'][fieldname] = navs context_data['filter_display'][fieldname] = display