From 7503846d4c648dcbad5008140ae575d3d4282254 Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Wed, 24 Nov 2021 10:25:40 +0100 Subject: [PATCH] keyword and desc model --- TealCode/TealCode/settings.py | 2 +- .../migrations/0002_auto_20211124_1017.py | 37 +++++++++++++++++++ TealCode/main/models.py | 4 ++ TealCode/main/views.py | 4 ++ 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 TealCode/main/migrations/0002_auto_20211124_1017.py diff --git a/TealCode/TealCode/settings.py b/TealCode/TealCode/settings.py index d5c3234..cb59c68 100644 --- a/TealCode/TealCode/settings.py +++ b/TealCode/TealCode/settings.py @@ -23,7 +23,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent SECRET_KEY = 'django-insecure-84w$au&)%5rl8ud!82e%&)e&r+c0f9z%zlr4m9(76mebvx-r2@' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True ALLOWED_HOSTS = ['code.tealfire.de'] diff --git a/TealCode/main/migrations/0002_auto_20211124_1017.py b/TealCode/main/migrations/0002_auto_20211124_1017.py new file mode 100644 index 0000000..e236c25 --- /dev/null +++ b/TealCode/main/migrations/0002_auto_20211124_1017.py @@ -0,0 +1,37 @@ +# Generated by Django 3.2.9 on 2021-11-24 09:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='category', + name='description', + field=models.CharField(default='tag', max_length=250), + preserve_default=False, + ), + migrations.AddField( + model_name='category', + name='tags', + field=models.CharField(default='e', max_length=250), + preserve_default=False, + ), + migrations.AddField( + model_name='topic', + name='description', + field=models.CharField(default='ads', max_length=250), + preserve_default=False, + ), + migrations.AddField( + model_name='topic', + name='tags', + field=models.CharField(default='aasd', max_length=250), + preserve_default=False, + ), + ] diff --git a/TealCode/main/models.py b/TealCode/main/models.py index e6904ca..807c6c6 100644 --- a/TealCode/main/models.py +++ b/TealCode/main/models.py @@ -5,6 +5,8 @@ class Category(models.Model): title = models.CharField(max_length=100, unique=True) display_name = models.CharField(max_length= 100) date_created = models.DateTimeField(default=timezone.now) + tags = models.CharField(max_length=250) + description = models.CharField(max_length=250) def __str__(self): return self.title @@ -18,6 +20,8 @@ class Topic(models.Model): category = models.ForeignKey(Category, on_delete=models.CASCADE) version = models.CharField(max_length=100, blank=True) read_more = models.TextField(blank=True) + tags = models.CharField(max_length=250) + description = models.CharField(max_length=250) def __str__(self): return self.category.title + " - " + self.title diff --git a/TealCode/main/views.py b/TealCode/main/views.py index 14d14e1..0ad6343 100644 --- a/TealCode/main/views.py +++ b/TealCode/main/views.py @@ -36,6 +36,8 @@ def topic(req, category, topic): 'helpful_count': helpful_count, 'notHelpful_count': notHelpful_count, 'read_more': topic_obj.read_more, + 'keywords': topic_obj.tags, + 'description': topic_obj.description, } return render(req, "main/topic.html", context) @@ -55,6 +57,8 @@ def category(req, category): 'topics': topics_obj, 'current': category_obj.title, 'title': category_obj.display_name, + 'keywords': category_obj.tags, + 'description': category_obj.description, } return render(req, "main/category.html", context)