From 3077150f78f1fb40d8ff84e57287a44427b769e6 Mon Sep 17 00:00:00 2001 From: Emilie Date: Wed, 12 Oct 2016 17:11:56 +0200 Subject: [PATCH] Network : add css class on organization type --- .../0037_organizationtype_css_class.py | 20 +++++++++++++++++++ app/organization/network/models.py | 2 ++ app/organization/network/views.py | 2 +- app/templates/network/organization_list.html | 2 +- 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 app/organization/network/migrations/0037_organizationtype_css_class.py diff --git a/app/organization/network/migrations/0037_organizationtype_css_class.py b/app/organization/network/migrations/0037_organizationtype_css_class.py new file mode 100644 index 00000000..ba03782c --- /dev/null +++ b/app/organization/network/migrations/0037_organizationtype_css_class.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-10-12 15:07 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-network', '0036_auto_20161005_1509'), + ] + + operations = [ + migrations.AddField( + model_name='organizationtype', + name='css_class', + field=models.CharField(blank=True, help_text='Determine color on map.', max_length=64, null=True, verbose_name='class css'), + ), + ] diff --git a/app/organization/network/models.py b/app/organization/network/models.py index 69430548..b7028907 100644 --- a/app/organization/network/models.py +++ b/app/organization/network/models.py @@ -153,6 +153,8 @@ class OrganizationBlock(Block): class OrganizationType(Named): """(OrganizationType description)""" + css_class = models.CharField(_('class css'), max_length=64, blank=True, null=True, help_text="Determine color on map.") + class Meta: verbose_name = _('organization type') ordering = ['name',] diff --git a/app/organization/network/views.py b/app/organization/network/views.py index 46bfbb22..5b2fd351 100644 --- a/app/organization/network/views.py +++ b/app/organization/network/views.py @@ -64,5 +64,5 @@ class OrganizationListView(ListView): def get_context_data(self, **kwargs): context = super(OrganizationListView, self).get_context_data(**kwargs) - context['organization_types'] = self.get_queryset().values_list('type__name', flat=True).order_by('type__name').distinct('type__name') + context['organization_types'] = self.get_queryset().values_list('type__name', 'type__css_class').order_by('type__name').distinct('type__name') return context diff --git a/app/templates/network/organization_list.html b/app/templates/network/organization_list.html index b683b11e..6b0206f9 100644 --- a/app/templates/network/organization_list.html +++ b/app/templates/network/organization_list.html @@ -59,7 +59,7 @@ {{ organization.city }}, {{ organization.country.name }}
- {{ organization.type }} + {{ organization.type }}, {{ organization.type.css_class }}
-- 2.39.5