diff --git a/article/.models.py.swp b/article/.models.py.swp new file mode 100644 index 0000000..0e16479 Binary files /dev/null and b/article/.models.py.swp differ diff --git a/article/__pycache__/admin.cpython-36.pyc b/article/__pycache__/admin.cpython-36.pyc index 0ba6d30..b0f0c0f 100644 Binary files a/article/__pycache__/admin.cpython-36.pyc and b/article/__pycache__/admin.cpython-36.pyc differ diff --git a/article/__pycache__/adminx.cpython-36.pyc b/article/__pycache__/adminx.cpython-36.pyc index 934b0ca..4a249ed 100644 Binary files a/article/__pycache__/adminx.cpython-36.pyc and b/article/__pycache__/adminx.cpython-36.pyc differ diff --git a/article/__pycache__/models.cpython-36.pyc b/article/__pycache__/models.cpython-36.pyc index 13a6f49..1bdf574 100644 Binary files a/article/__pycache__/models.cpython-36.pyc and b/article/__pycache__/models.cpython-36.pyc differ diff --git a/article/migrations/0003_article_author_id.py b/article/migrations/0003_article_author_id.py new file mode 100644 index 0000000..aa3995c --- /dev/null +++ b/article/migrations/0003_article_author_id.py @@ -0,0 +1,21 @@ +# Generated by Django 2.0.2 on 2018-02-24 02:29 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('article', '0002_article_visible'), + ] + + operations = [ + migrations.AddField( + model_name='article', + name='author_id', + field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/article/migrations/__pycache__/0003_article_author_id.cpython-36.pyc b/article/migrations/__pycache__/0003_article_author_id.cpython-36.pyc new file mode 100644 index 0000000..04a85a3 Binary files /dev/null and b/article/migrations/__pycache__/0003_article_author_id.cpython-36.pyc differ diff --git a/article/migrations/__pycache__/0004_auto_20180224_0222.cpython-36.pyc b/article/migrations/__pycache__/0004_auto_20180224_0222.cpython-36.pyc new file mode 100644 index 0000000..6ce4519 Binary files /dev/null and b/article/migrations/__pycache__/0004_auto_20180224_0222.cpython-36.pyc differ diff --git a/article/migrations/__pycache__/0005_remove_article_author_id.cpython-36.pyc b/article/migrations/__pycache__/0005_remove_article_author_id.cpython-36.pyc new file mode 100644 index 0000000..ce5301f Binary files /dev/null and b/article/migrations/__pycache__/0005_remove_article_author_id.cpython-36.pyc differ diff --git a/article/migrations/__pycache__/0006_article_author_id.cpython-36.pyc b/article/migrations/__pycache__/0006_article_author_id.cpython-36.pyc new file mode 100644 index 0000000..625fedc Binary files /dev/null and b/article/migrations/__pycache__/0006_article_author_id.cpython-36.pyc differ diff --git a/article/migrations/__pycache__/0007_remove_article_author_id.cpython-36.pyc b/article/migrations/__pycache__/0007_remove_article_author_id.cpython-36.pyc new file mode 100644 index 0000000..37ddcc7 Binary files /dev/null and b/article/migrations/__pycache__/0007_remove_article_author_id.cpython-36.pyc differ diff --git a/article/migrations/__pycache__/0008_delete_article.cpython-36.pyc b/article/migrations/__pycache__/0008_delete_article.cpython-36.pyc new file mode 100644 index 0000000..8169317 Binary files /dev/null and b/article/migrations/__pycache__/0008_delete_article.cpython-36.pyc differ diff --git a/article/models.py b/article/models.py index 5e0ffb6..f609a20 100644 --- a/article/models.py +++ b/article/models.py @@ -1,6 +1,8 @@ # coding=utf-8 from django.db import models from tinymce.models import HTMLField +from django.contrib.auth.models import User +#from django.conf import settings #from tagging.fields import TagField #from tagging.models import Tag @@ -10,6 +12,8 @@ class Article(models.Model): id=models.AutoField(primary_key=True) #catalog=models.ForeignKey(Catalogs) author = models.CharField(max_length=128,default='小志') + author_id = models.ForeignKey(User,on_delete=models.CASCADE,default=0) + #author_id = models.ForeignKey(settings.AUTH_USER_MODEL,on_delete=models.CASCADE) publish_date = models.DateTimeField(auto_now_add=True) title = models.CharField(max_length=1024) detail = HTMLField() diff --git a/db.sqlite3 b/db.sqlite3 index a494d26..19fa8c1 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ