From b5f632dffeeff0526ac1609f927cbdc12f98c710 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 15 Aug 2020 12:39:48 +0000 Subject: [PATCH] del default value of post_type, update gitignore file --- .gitignore | 6 +++-- .../migrations/0002_auto_20200717_1507.py | 23 ------------------- fet2020/fet2020/settings.py | 2 +- fet2020/fet2020/urls.py | 2 +- fet2020/posts/models.py | 2 +- 5 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 fet2020/documents/migrations/0002_auto_20200717_1507.py diff --git a/.gitignore b/.gitignore index 67258286..d1b92082 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ fet2020/files/* fet2020/.env/* *.sqlite3 -fet2020/posts/migrations/* -fet2020/members/migrations/* +fet2020/*/migrations/* .theia/* +.flake8 +migrate +run \ No newline at end of file diff --git a/fet2020/documents/migrations/0002_auto_20200717_1507.py b/fet2020/documents/migrations/0002_auto_20200717_1507.py deleted file mode 100644 index 3371a470..00000000 --- a/fet2020/documents/migrations/0002_auto_20200717_1507.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.0.6 on 2020-07-17 13:07 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('documents', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='document', - name='id', - ), - migrations.AddField( - model_name='document', - name='key', - field=models.CharField(default='', max_length=200, primary_key=True, serialize=False), - preserve_default=False, - ), - ] diff --git a/fet2020/fet2020/settings.py b/fet2020/fet2020/settings.py index 746bc384..792a0425 100644 --- a/fet2020/fet2020/settings.py +++ b/fet2020/fet2020/settings.py @@ -32,7 +32,7 @@ LOGGING = { # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -SESSION_COOKIE_DOMAIN =".2020.fet.at" +SESSION_COOKIE_DOMAIN = ".2020.fet.at" # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/ diff --git a/fet2020/fet2020/urls.py b/fet2020/fet2020/urls.py index ac4ea36b..cd376bf8 100644 --- a/fet2020/fet2020/urls.py +++ b/fet2020/fet2020/urls.py @@ -28,7 +28,7 @@ router.register(r'members', MemberViewSet) urlpatterns = [ path('posts/', include('posts.urls')), - path('admin/doc/', include('django.contrib.admindocs.urls')), + path('admin/doc/', include('django.contrib.admindocs.urls')), path('admin/', admin.site.urls), path('', views.index, name='home'), path('index.html', views.index, name='home'), diff --git a/fet2020/posts/models.py b/fet2020/posts/models.py index 133bbba1..fa4e5023 100644 --- a/fet2020/posts/models.py +++ b/fet2020/posts/models.py @@ -105,7 +105,7 @@ class Post(models.Model): ('E', _('Event')), ('F', _('FetMeeting')) ] - post_type = models.CharField(max_length=1, choices=__choices, editable=False, default='N') + post_type = models.CharField(max_length=1, choices=__choices, editable=False) is_event = models.BooleanField(default=False)