diff --git a/client/src/components/content-block-form/ContentsForm.vue b/client/src/components/content-block-form/ContentsForm.vue index 4c83bf8c..b873590e 100644 --- a/client/src/components/content-block-form/ContentsForm.vue +++ b/client/src/components/content-block-form/ContentsForm.vue @@ -14,9 +14,7 @@ @input="setContentBlockType" class="contents-form__task" > - +

{{roomEntry.title}}

-

{{roomEntry.subtitle}}

diff --git a/server/core/management/commands/dummy_rooms.py b/server/core/management/commands/dummy_rooms.py index 943bb582..da0f9068 100644 --- a/server/core/management/commands/dummy_rooms.py +++ b/server/core/management/commands/dummy_rooms.py @@ -19,7 +19,6 @@ data = [ 'entries': [ { 'title': 'Ein neues Festival auf dem Gurten – und ich bin dabei!', - 'subtitle': 'Endlich war es soweit. Zum ersten Mal fand am 2. und 3. Juli 1977 das 1. Internationale …', 'contents': [ { 'type': 'image_url_block', @@ -45,7 +44,6 @@ data = [ }, { 'title': 'Mein Tagesblog', - 'subtitle': 'https://blogger.com/cruel-festivals-around-the-world/', 'contents': [ { 'type': 'image_url_block', @@ -71,7 +69,6 @@ data = [ }, { 'title': 'Woodstock', - 'subtitle': 'In Woodstock hat sich dem Mythos nach vor genau vierzig Jahren das Lebensgefühl …', 'contents': [ { 'type': 'image_url_block', @@ -91,7 +88,6 @@ data = [ }, { 'title': 'Das Festival', - 'subtitle': 'www.meinblog.ch', 'contents': [ { 'type': 'image_url_block', @@ -124,7 +120,6 @@ data = [ 'entries': [ { 'title': 'Ich heisse Jan und habe am 01. August 2017 meine Ausbildung begonnen. Pünktlich zum …', - 'subtitle': '', 'contents': [ { 'type': 'image_url_block', @@ -150,7 +145,6 @@ data = [ }, { 'title': 'Mein Lehrbeginn', - 'subtitle': 'Was war ich angespannt… und nervös. Das hat sich aber schnell gelegt.', 'contents': [ { 'type': 'image_url_block', diff --git a/server/rooms/factories.py b/server/rooms/factories.py index 1b94cc16..e7c2acea 100644 --- a/server/rooms/factories.py +++ b/server/rooms/factories.py @@ -29,7 +29,6 @@ class RoomEntryFactory(factory.django.DjangoModelFactory): model = RoomEntry title = factory.LazyAttribute(lambda x: fake.sentence(nb_words=random.randint(8, 12))) - subtitle = factory.LazyAttribute(lambda x: fake.sentence(nb_words=random.randint(8, 12))) description = factory.LazyAttribute(lambda x: fake.sentence(nb_words=random.randint(20, 30))) author = factory.Iterator(get_user_model().objects.all()) room = factory.SubFactory(RoomFactory) diff --git a/server/rooms/inputs.py b/server/rooms/inputs.py index b8c78018..b8c90355 100644 --- a/server/rooms/inputs.py +++ b/server/rooms/inputs.py @@ -22,7 +22,6 @@ class UpdateRoomArgument(RoomInput): class RoomEntryArgument(InputObjectType): title = graphene.String(required=True) - subtitle = graphene.String() contents = graphene.List(ContentElementInput) diff --git a/server/rooms/migrations/0003_remove_roomentry_subtitle.py b/server/rooms/migrations/0003_remove_roomentry_subtitle.py new file mode 100644 index 00000000..d3d41699 --- /dev/null +++ b/server/rooms/migrations/0003_remove_roomentry_subtitle.py @@ -0,0 +1,17 @@ +# Generated by Django 2.0.6 on 2018-11-01 15:06 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('rooms', '0002_auto_20181015_1237'), + ] + + operations = [ + migrations.RemoveField( + model_name='roomentry', + name='subtitle', + ), + ] diff --git a/server/rooms/models.py b/server/rooms/models.py index f0bc8e18..16da5036 100644 --- a/server/rooms/models.py +++ b/server/rooms/models.py @@ -27,7 +27,6 @@ class RoomEntry(TitleSlugDescriptionModel): room = models.ForeignKey(Room, blank=False, null=False, on_delete=models.CASCADE, related_name='room_entries') author = models.ForeignKey(get_user_model(), null=True, on_delete=models.CASCADE) - subtitle = models.CharField(blank=True, null=False, max_length=255) contents = StreamField([ ('text_block', TextBlock()), diff --git a/server/rooms/serializers.py b/server/rooms/serializers.py index 98e28b65..2ab368be 100644 --- a/server/rooms/serializers.py +++ b/server/rooms/serializers.py @@ -23,7 +23,7 @@ class RoomEntrySerializer(serializers.ModelSerializer): class Meta: model = RoomEntry - fields = ('room', 'author', 'subtitle', 'title', 'contents') + fields = ('room', 'author', 'title', 'contents') read_only_fields = ('id', 'slug',) def validate_contents(self, value):