From fe5033a5e0293c614e583843265759017378b56c Mon Sep 17 00:00:00 2001 From: nadaj Date: Tue, 19 Jun 2018 15:52:35 +0200 Subject: [PATCH 1/5] Add Speakers talk excerpt --- pyconbalkan/speaker/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyconbalkan/speaker/models.py b/pyconbalkan/speaker/models.py index 4be73819..299d9836 100644 --- a/pyconbalkan/speaker/models.py +++ b/pyconbalkan/speaker/models.py @@ -6,6 +6,7 @@ class Speaker(ActiveModel, Person): keynote = models.BooleanField(default=False) + talk_excerpt = models.TextField(blank=True, null=True) class SpeakerPhoto(models.Model): From 05346734e1eb64d2b3be1f5a47537fd9372b2ec2 Mon Sep 17 00:00:00 2001 From: nadaj Date: Tue, 19 Jun 2018 15:53:34 +0200 Subject: [PATCH 2/5] Add Speakers talk excerpt --- .../migrations/0008_AddSpeakersExcerpt.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 pyconbalkan/speaker/migrations/0008_AddSpeakersExcerpt.py diff --git a/pyconbalkan/speaker/migrations/0008_AddSpeakersExcerpt.py b/pyconbalkan/speaker/migrations/0008_AddSpeakersExcerpt.py new file mode 100644 index 00000000..e8e9906e --- /dev/null +++ b/pyconbalkan/speaker/migrations/0008_AddSpeakersExcerpt.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.5 on 2018-06-19 13:52 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('speaker', '0007_speaker_github'), + ] + + operations = [ + migrations.AddField( + model_name='speaker', + name='talk_excerpt', + field=models.TextField(blank=True, null=True), + ), + ] From 52df4f5a7c24ff8bbd1ffbd4f64e71abd10ba438 Mon Sep 17 00:00:00 2001 From: nadaj Date: Wed, 20 Jun 2018 08:07:45 +0200 Subject: [PATCH 3/5] Speaker excerpt as markdown field --- ...008_AddSpeakersExcerpt.py => 0008_AddSpeakerExcerpt.py} | 7 ++++--- pyconbalkan/speaker/models.py | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) rename pyconbalkan/speaker/migrations/{0008_AddSpeakersExcerpt.py => 0008_AddSpeakerExcerpt.py} (57%) diff --git a/pyconbalkan/speaker/migrations/0008_AddSpeakersExcerpt.py b/pyconbalkan/speaker/migrations/0008_AddSpeakerExcerpt.py similarity index 57% rename from pyconbalkan/speaker/migrations/0008_AddSpeakersExcerpt.py rename to pyconbalkan/speaker/migrations/0008_AddSpeakerExcerpt.py index e8e9906e..ac9fe9b3 100644 --- a/pyconbalkan/speaker/migrations/0008_AddSpeakersExcerpt.py +++ b/pyconbalkan/speaker/migrations/0008_AddSpeakerExcerpt.py @@ -1,6 +1,7 @@ -# Generated by Django 2.0.5 on 2018-06-19 13:52 +# Generated by Django 2.0.5 on 2018-06-20 06:07 -from django.db import migrations, models +from django.db import migrations +import markdownx.models class Migration(migrations.Migration): @@ -13,6 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='speaker', name='talk_excerpt', - field=models.TextField(blank=True, null=True), + field=markdownx.models.MarkdownxField(blank=True, null=True), ), ] diff --git a/pyconbalkan/speaker/models.py b/pyconbalkan/speaker/models.py index 299d9836..d0ceca6c 100644 --- a/pyconbalkan/speaker/models.py +++ b/pyconbalkan/speaker/models.py @@ -2,11 +2,12 @@ from django.db.models import CASCADE from pyconbalkan.core.models import Person, ActiveModel +from markdownx.models import MarkdownxField class Speaker(ActiveModel, Person): keynote = models.BooleanField(default=False) - talk_excerpt = models.TextField(blank=True, null=True) + talk_excerpt = MarkdownxField(null=True, blank=True) class SpeakerPhoto(models.Model): From 9f190853fdc0647f86524d76a2ab656d0af88aa4 Mon Sep 17 00:00:00 2001 From: nadaj Date: Wed, 20 Jun 2018 21:05:35 +0200 Subject: [PATCH 4/5] Migration name change --- .../{0008_AddSpeakerExcerpt.py => 0008_speaker_excerpt.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename pyconbalkan/speaker/migrations/{0008_AddSpeakerExcerpt.py => 0008_speaker_excerpt.py} (88%) diff --git a/pyconbalkan/speaker/migrations/0008_AddSpeakerExcerpt.py b/pyconbalkan/speaker/migrations/0008_speaker_excerpt.py similarity index 88% rename from pyconbalkan/speaker/migrations/0008_AddSpeakerExcerpt.py rename to pyconbalkan/speaker/migrations/0008_speaker_excerpt.py index ac9fe9b3..f4b6480b 100644 --- a/pyconbalkan/speaker/migrations/0008_AddSpeakerExcerpt.py +++ b/pyconbalkan/speaker/migrations/0008_speaker_excerpt.py @@ -1,4 +1,4 @@ -# Generated by Django 2.0.5 on 2018-06-20 06:07 +# Generated by Django 2.0.5 on 2018-06-20 19:04 from django.db import migrations import markdownx.models From 5349659f451efe1f5ee0343e563e90d6c733eaba Mon Sep 17 00:00:00 2001 From: nadaj Date: Fri, 22 Jun 2018 15:24:52 +0200 Subject: [PATCH 5/5] Speaker excerpt fix --- .../{0008_speaker_excerpt.py => 0009_speaker_excerpt.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename pyconbalkan/speaker/migrations/{0008_speaker_excerpt.py => 0009_speaker_excerpt.py} (89%) diff --git a/pyconbalkan/speaker/migrations/0008_speaker_excerpt.py b/pyconbalkan/speaker/migrations/0009_speaker_excerpt.py similarity index 89% rename from pyconbalkan/speaker/migrations/0008_speaker_excerpt.py rename to pyconbalkan/speaker/migrations/0009_speaker_excerpt.py index f4b6480b..c1ad18e7 100644 --- a/pyconbalkan/speaker/migrations/0008_speaker_excerpt.py +++ b/pyconbalkan/speaker/migrations/0009_speaker_excerpt.py @@ -7,7 +7,7 @@ class Migration(migrations.Migration): dependencies = [ - ('speaker', '0007_speaker_github'), + ('speaker', '0008_person_email'), ] operations = [