From feea7d83f4211fd88f2a781057039b1dea711eda Mon Sep 17 00:00:00 2001 From: Emilie Date: Fri, 21 Oct 2016 13:37:50 +0200 Subject: [PATCH] Task #248: add title on link --- .../agenda/migrations/0013_eventlink_title.py | 21 ++++++++++++++++ .../migrations/0014_auto_20161021_1319.py | 20 +++++++++++++++ app/organization/core/models.py | 1 + .../migrations/0042_auto_20161021_1319.py | 25 +++++++++++++++++++ .../pages/migrations/0011_pagelink_title.py | 20 +++++++++++++++ .../migrations/0022_projectlink_title.py | 20 +++++++++++++++ .../shop/migrations/0008_productlink_title.py | 20 +++++++++++++++ app/templates/core/inc/link.html | 2 +- .../inc/person/person_card_circle.html | 2 +- 9 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 app/organization/agenda/migrations/0013_eventlink_title.py create mode 100644 app/organization/agenda/migrations/0014_auto_20161021_1319.py create mode 100644 app/organization/network/migrations/0042_auto_20161021_1319.py create mode 100644 app/organization/pages/migrations/0011_pagelink_title.py create mode 100644 app/organization/projects/migrations/0022_projectlink_title.py create mode 100644 app/organization/shop/migrations/0008_productlink_title.py diff --git a/app/organization/agenda/migrations/0013_eventlink_title.py b/app/organization/agenda/migrations/0013_eventlink_title.py new file mode 100644 index 00000000..276cf9de --- /dev/null +++ b/app/organization/agenda/migrations/0013_eventlink_title.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-10-21 11:06 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-agenda', '0012_auto_20161020_1051'), + ] + + operations = [ + migrations.AddField( + model_name='eventlink', + name='title', + field=models.CharField(default='', max_length=1024, verbose_name='title'), + preserve_default=False, + ), + ] diff --git a/app/organization/agenda/migrations/0014_auto_20161021_1319.py b/app/organization/agenda/migrations/0014_auto_20161021_1319.py new file mode 100644 index 00000000..c2e3c511 --- /dev/null +++ b/app/organization/agenda/migrations/0014_auto_20161021_1319.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-10-21 11:19 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-agenda', '0013_eventlink_title'), + ] + + operations = [ + migrations.AlterField( + model_name='eventlink', + name='title', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='title'), + ), + ] diff --git a/app/organization/core/models.py b/app/organization/core/models.py index 3c821c77..d8546e02 100644 --- a/app/organization/core/models.py +++ b/app/organization/core/models.py @@ -174,6 +174,7 @@ class LinkType(models.Model): class Link(URL): """A person can have many links.""" + title = models.CharField(_('title'), max_length=1024, null=True, blank=True) link_type = models.ForeignKey(LinkType, verbose_name=_('link type')) class Meta: diff --git a/app/organization/network/migrations/0042_auto_20161021_1319.py b/app/organization/network/migrations/0042_auto_20161021_1319.py new file mode 100644 index 00000000..39acb2a0 --- /dev/null +++ b/app/organization/network/migrations/0042_auto_20161021_1319.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-10-21 11:19 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-network', '0041_auto_20161018_1236'), + ] + + operations = [ + migrations.AddField( + model_name='organizationlink', + name='title', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='title'), + ), + migrations.AddField( + model_name='personlink', + name='title', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='title'), + ), + ] diff --git a/app/organization/pages/migrations/0011_pagelink_title.py b/app/organization/pages/migrations/0011_pagelink_title.py new file mode 100644 index 00000000..cb4ff9c5 --- /dev/null +++ b/app/organization/pages/migrations/0011_pagelink_title.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-10-21 11:19 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-pages', '0010_auto_20161021_1256'), + ] + + operations = [ + migrations.AddField( + model_name='pagelink', + name='title', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='title'), + ), + ] diff --git a/app/organization/projects/migrations/0022_projectlink_title.py b/app/organization/projects/migrations/0022_projectlink_title.py new file mode 100644 index 00000000..430feb0f --- /dev/null +++ b/app/organization/projects/migrations/0022_projectlink_title.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-10-21 11:19 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-projects', '0021_auto_20161014_0002'), + ] + + operations = [ + migrations.AddField( + model_name='projectlink', + name='title', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='title'), + ), + ] diff --git a/app/organization/shop/migrations/0008_productlink_title.py b/app/organization/shop/migrations/0008_productlink_title.py new file mode 100644 index 00000000..204dff89 --- /dev/null +++ b/app/organization/shop/migrations/0008_productlink_title.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.10 on 2016-10-21 11:19 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-shop', '0007_auto_20161020_2035'), + ] + + operations = [ + migrations.AddField( + model_name='productlink', + name='title', + field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='title'), + ), + ] diff --git a/app/templates/core/inc/link.html b/app/templates/core/inc/link.html index 89d5933c..047eee10 100644 --- a/app/templates/core/inc/link.html +++ b/app/templates/core/inc/link.html @@ -4,6 +4,6 @@

diff --git a/app/templates/network/inc/person/person_card_circle.html b/app/templates/network/inc/person/person_card_circle.html index ed10adde..432ea9b8 100644 --- a/app/templates/network/inc/person/person_card_circle.html +++ b/app/templates/network/inc/person/person_card_circle.html @@ -33,7 +33,7 @@ {% endif %} {% for link in person.links.all %} {% if link %} - {{ link.link_type.name }} + {% firstof link.title link.link_type.name %} {% endif %} {% endfor %} -- 2.39.5