prepare release (fix error in Django 2.0)

genonfire · Jul 12, 2018 · 386cfd3 · 386cfd3
1 parent 21670bc
commit 386cfd3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.239
+1.1.240
diff --git a/accounts/migrations/0003_profile_alarm_paper.py b/accounts/migrations/0003_profile_alarm_paper.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-07-10 04:45
+# Generated by Django 1.11.10 on 2018-07-12 03:28
 from __future__ import unicode_literals
 
 from django.db import migrations, models

diff --git a/accounts/models.py b/accounts/models.py
@@ -54,8 +54,9 @@ class Profile(models.Model):
 class UserSession(models.Model):
     """User key for Session"""
 
-    user = models.ForeignKey(settings.AUTH_USER_MODEL)
-    session = models.ForeignKey(Session)
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+    session = models.ForeignKey(Session, on_delete=models.CASCADE)
 
 
 @receiver(post_save, sender=User)

diff --git a/papers/migrations/0001_initial.py b/papers/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-07-10 04:46
+# Generated by Django 1.11.10 on 2018-07-12 03:25
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
             name='Paper',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('status', models.CharField(choices=[('3rejected', '\ubc18\ub824'), ('2progress', '\uacb0\uc7ac\uc911'), ('4canceled', '\ucde8\uc18c'), ('5completed', '\uc644\uacb0'), ('1proposed', '\uae30\uc548')], default='1proposed', max_length=12)),
+                ('status', models.CharField(choices=[('5completed', '\uacb0\uc7ac\uc644\ub8cc'), ('3rejected', '\ubc18\ub824'), ('2progress', '\uacb0\uc7ac\uc911'), ('4canceled', '\ucde8\uc18c'), ('1proposed', '\uae30\uc548')], default='1proposed', max_length=12)),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('title', models.CharField(max_length=41)),
                 ('content', models.TextField()),

diff --git a/static/css/haru-1.1.css → static/css/haru-1.2.css b/static/css/haru-1.1.css → static/css/haru-1.2.css
diff --git a/templates/haru/base.html b/templates/haru/base.html
@@ -23,7 +23,7 @@
 {% else %}
     <link rel="stylesheet" href="https://fonts.googleapis.com/earlyaccess/notosanskr.css">
 {% endif %}
-<link rel="stylesheet" href="{% static 'css/haru-1.1.css' %}">
+<link rel="stylesheet" href="{% static 'css/haru-1.2.css' %}">
 <link rel="stylesheet" href="{% static 'css/waitMe.css' %}">
 <script src="{% static 'js/thirdparty/jquery-3.2.1.min.js' %}"></script>
 <script src="{% static 'jsi18n' %}/{{ LANGUAGE_CODE }}/djangojs.js"></script>