diff --git a/blog/admin.py b/blog/admin.py index 705a85c..f237171 100644 --- a/blog/admin.py +++ b/blog/admin.py @@ -6,4 +6,4 @@ from blog import models, forms class ArticleAdmin(admin.ModelAdmin): form = forms.ArticleAdminForm fields = ['title', 'author', 'text', 'photo'] - list_display = ['title', 'author'] + list_display = ['title', 'author', 'created_at'] diff --git a/blog/migrations/0002_article_created_at.py b/blog/migrations/0002_article_created_at.py new file mode 100644 index 0000000..dec8267 --- /dev/null +++ b/blog/migrations/0002_article_created_at.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import datetime +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('blog', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='article', + name='created_at', + field=models.DateField(default=datetime.datetime(2015, 7, 22, 17, 55, 41, 780027, tzinfo=utc), auto_now_add=True), + preserve_default=False, + ), + ] diff --git a/blog/models.py b/blog/models.py index 5b16a64..12e40bd 100644 --- a/blog/models.py +++ b/blog/models.py @@ -6,3 +6,4 @@ class Article(models.Model): text = models.TextField() author = models.CharField(max_length=20) photo = models.ImageField(upload_to='article_photos') + created_at = models.DateField(auto_now_add=True) diff --git a/member/forms.py b/member/forms.py index 71e1d35..b18ef56 100644 --- a/member/forms.py +++ b/member/forms.py @@ -2,7 +2,6 @@ from django import forms from member import models class MemberAdminForm(forms.ModelForm): - photo = forms.ImageField(required=False) class Meta: model = models.Member fields = ['first_name', 'last_name', 'email', 'photo', 'is_admin', 'position'] diff --git a/member/migrations/0004_auto_20150722_1745.py b/member/migrations/0004_auto_20150722_1745.py new file mode 100644 index 0000000..5d50ad2 --- /dev/null +++ b/member/migrations/0004_auto_20150722_1745.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('member', '0003_auto_20150721_1829'), + ] + + operations = [ + migrations.AlterField( + model_name='member', + name='photo', + field=models.ImageField(null=True, upload_to=b'members', blank=True), + preserve_default=True, + ), + ] diff --git a/member/migrations/0005_auto_20150722_1747.py b/member/migrations/0005_auto_20150722_1747.py new file mode 100644 index 0000000..0cd04e2 --- /dev/null +++ b/member/migrations/0005_auto_20150722_1747.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('member', '0004_auto_20150722_1745'), + ] + + operations = [ + migrations.AlterField( + model_name='member', + name='position', + field=models.CharField(max_length=50, null=True, blank=True), + preserve_default=True, + ), + ] diff --git a/member/models.py b/member/models.py index 39e8c71..28c682e 100644 --- a/member/models.py +++ b/member/models.py @@ -7,4 +7,4 @@ class Member(models.Model): email = models.CharField(max_length=50) photo = models.ImageField(upload_to="members", blank=True, null=True) is_admin = models.BooleanField(default=False) - position = models.CharField(max_length=50) + position = models.CharField(max_length=50, blank=True, null=True) diff --git a/project/forms.py b/project/forms.py index 6b81328..a9fe777 100644 --- a/project/forms.py +++ b/project/forms.py @@ -1,4 +1,5 @@ from django import forms +from project import models from member import models as member_models @@ -9,4 +10,7 @@ class MemberMultipleChoiceField(forms.ModelMultipleChoiceField): class ProjectAdminForm(forms.ModelForm): - members = MemberMultipleChoiceField(queryset=member_models.Member.objects.all()) + members = MemberMultipleChoiceField(queryset=member_models.Member.objects.all(), required=False) + class Meta: + model = models.Project + fields = ['name', 'description', 'download', 'screenshot', 'members'] diff --git a/project/migrations/0002_auto_20150722_1745.py b/project/migrations/0002_auto_20150722_1745.py new file mode 100644 index 0000000..e8d042f --- /dev/null +++ b/project/migrations/0002_auto_20150722_1745.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('project', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='project', + name='description', + field=models.TextField(null=True, blank=True), + preserve_default=True, + ), + migrations.AlterField( + model_name='project', + name='download', + field=models.FileField(null=True, upload_to=b'projects_downloads', blank=True), + preserve_default=True, + ), + migrations.AlterField( + model_name='project', + name='members', + field=models.ManyToManyField(to='member.Member', null=True, blank=True), + preserve_default=True, + ), + migrations.AlterField( + model_name='project', + name='screenshot', + field=models.ImageField(null=True, upload_to=b'projects_screenshots', blank=True), + preserve_default=True, + ), + ] diff --git a/project/models.py b/project/models.py index 1537ca9..9a43d51 100644 --- a/project/models.py +++ b/project/models.py @@ -3,7 +3,7 @@ from member.models import * class Project(models.Model): name = models.CharField(max_length=100) - description = models.TextField() - download = models.FileField(upload_to='projects_downloads') - screenshot = models.ImageField(upload_to='projects_screenshots') - members = models.ManyToManyField(Member) + description = models.TextField(null=True, blank=True) + download = models.FileField(upload_to='projects_downloads', null=True, blank=True) + screenshot = models.ImageField(upload_to='projects_screenshots', null=True, blank=True) + members = models.ManyToManyField(Member, null=True, blank=True)