From c904a0101ace4671995c5aa21242c10f038fa1a9 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 20 May 2020 13:14:19 +0200 Subject: [PATCH] Add migrations, add admin, fix query --- server/newsteaser/admin.py | 9 +++++++ server/newsteaser/migrations/0001_initial.py | 26 ++++++++++++++++++++ server/newsteaser/migrations/__init__.py | 0 server/newsteaser/models.py | 3 +++ server/newsteaser/schema.py | 2 +- 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 server/newsteaser/admin.py create mode 100644 server/newsteaser/migrations/0001_initial.py create mode 100644 server/newsteaser/migrations/__init__.py diff --git a/server/newsteaser/admin.py b/server/newsteaser/admin.py new file mode 100644 index 00000000..838b177c --- /dev/null +++ b/server/newsteaser/admin.py @@ -0,0 +1,9 @@ +from django.contrib import admin +from newsteaser.models import NewsTeaser + + +@admin.register(NewsTeaser) +class NewsTeaserAdmin(admin.ModelAdmin): + list_display = ('title', 'date', 'order_id') + list_filter = ('title',) + diff --git a/server/newsteaser/migrations/0001_initial.py b/server/newsteaser/migrations/0001_initial.py new file mode 100644 index 00000000..ed0e4131 --- /dev/null +++ b/server/newsteaser/migrations/0001_initial.py @@ -0,0 +1,26 @@ +# Generated by Django 2.1.15 on 2020-05-20 10:57 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='NewsTeaser', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('image_url', models.URLField(null=True, verbose_name='Image URL')), + ('title', models.CharField(max_length=300, verbose_name='Title')), + ('description', models.TextField(null=True, verbose_name='Description')), + ('date', models.DateField(null=True)), + ('order_id', models.IntegerField(default=-1)), + ('news_article_url', models.URLField(null=True, verbose_name='News Article URL')), + ], + ), + ] diff --git a/server/newsteaser/migrations/__init__.py b/server/newsteaser/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/server/newsteaser/models.py b/server/newsteaser/models.py index 283996ba..4878934c 100644 --- a/server/newsteaser/models.py +++ b/server/newsteaser/models.py @@ -9,3 +9,6 @@ class NewsTeaser(models.Model): date = models.DateField(blank=False, null=True) order_id = models.IntegerField(blank=False, null=False, default=-1) news_article_url = models.URLField(_('News Article URL'), blank=False, null=True) + + def __str__(self): + return '{}'.format(self.title) diff --git a/server/newsteaser/schema.py b/server/newsteaser/schema.py index 2cd39079..e0f57041 100644 --- a/server/newsteaser/schema.py +++ b/server/newsteaser/schema.py @@ -17,4 +17,4 @@ class AllNewsTeasersQuery(object): articles = DjangoFilterConnectionField(NewsTeaserNode) def resolve_articles(self, info, **kwargs): - return AllNewsTeasersQuery.objects.all() + return NewsTeaser.objects.all()