Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Commit

Permalink
fix: Model Settings #2
Browse files Browse the repository at this point in the history
  • Loading branch information
JustKode committed Mar 27, 2019
1 parent 1f02146 commit b9c1bf5
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 15 deletions.
Binary file modified db.sqlite3
Binary file not shown.
4 changes: 2 additions & 2 deletions dcomhomepage/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
'DIRS': [
os.path.join(BASE_DIR, 'templates')
],
'APP_DIRS': False,
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
Expand Down Expand Up @@ -122,7 +122,7 @@

USE_L10N = True

USE_TZ = True
USE_TZ = False


# Static files (CSS, JavaScript, Images)
Expand Down
2 changes: 1 addition & 1 deletion dcomhomepage/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
path('study/', include('study.urls')),
path('user/', include('user.urls')),
path('ckeditor/', include('ckeditor_uploader.urls')),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
]
5 changes: 3 additions & 2 deletions dcomhomepage/views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django.shortcuts import render

from post.models import PostNotice

def index(request):
name = '오윤석'
return render(request, 'index.html', {'name': name})
posts = PostNotice.objects.all()
return render(request, 'index.html', {'name': name, 'posts': posts})
3 changes: 2 additions & 1 deletion post/admin.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from django.contrib import admin
from post.models import PostStudy, PostJokbo, PostAlbum, PostFree, PostStudyMember
from post.models import PostStudy, PostJokbo, PostAlbum, PostFree, PostStudyMember, PostNotice
# Register your models here.

admin.site.register(PostStudyMember)
admin.site.register(PostStudy)
admin.site.register(PostFree)
admin.site.register(PostJokbo)
admin.site.register(PostAlbum)
admin.site.register(PostNotice)

32 changes: 23 additions & 9 deletions post/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class PostFree(models.Model):
title = models.CharField(max_length=50)
content = RichTextUploadingField()
writer = models.CharField(max_length=50)
parent = models.CharField(max_length=20, default=None)
parent = models.ForeignKey("self", on_delete=models.CASCADE) # 자기 자신 가르킴
userIdx = models.ForeignKey(User, on_delete=models.CASCADE)
hit = models.IntegerField(default=0)
writedAt = models.CharField(max_length=20)
Expand All @@ -19,7 +19,7 @@ class PostAlbum(models.Model):
title = models.CharField(max_length=50)
content = RichTextUploadingField()
writer = models.CharField(max_length=50)
parent = models.CharField(max_length=20, default=None)
parent = models.ForeignKey("self", on_delete=models.CASCADE)
userIdx = models.ForeignKey(User, on_delete=models.CASCADE)
hit = models.IntegerField(default=0)
writedAt = models.CharField(max_length=20)
Expand All @@ -30,7 +30,7 @@ class PostJokbo(models.Model):
title = models.CharField(max_length=50)
content = RichTextUploadingField()
writer = models.CharField(max_length=50)
parent = models.CharField(max_length=20, default=None)
parent = models.ForeignKey("self", on_delete=models.CASCADE)
userIdx = models.ForeignKey(User, on_delete=models.CASCADE)
hit = models.IntegerField(default=0)
writedAt = models.CharField(max_length=20)
Expand All @@ -41,13 +41,14 @@ class PostStudy(models.Model):
title = models.CharField(max_length=50)
content = RichTextUploadingField()
writer = models.CharField(max_length=50)
parent = models.CharField(max_length=20, default=None)
parent = models.ForeignKey("self", on_delete=models.CASCADE)
userIdx = models.ForeignKey(User, on_delete=models.CASCADE)
hit = models.IntegerField(default=0)
writedAt = models.CharField(max_length=20)
link = models.CharField(max_length=50)
startDate = models.DateField('date study started')
endDate = models.DateField('date study ended')
tag = models.CharField(max_length=10)


class PostStudyMember(models.Model):
Expand All @@ -57,12 +58,25 @@ class PostStudyMember(models.Model):


class PostNotice(models.Model):
TAGS = (
('공지', '공지'),
('행사', '행사'),
('대회', '대회'),
('프젝', '프젝'),
('기타', '기타'),
)

# blank=True : Form 사용 시 입력 안해도 오류 X
# null=True : Foreign Key가 null 값을 가져도 되게 함
title = models.CharField(max_length=50)
content = RichTextUploadingField()
writer = models.CharField(max_length=50)
parent = models.CharField(max_length=20, default=None)
userIdx = models.ForeignKey(User, on_delete=models.CASCADE)
parent = models.ForeignKey("self", on_delete=models.CASCADE, blank=True, null=True)
userIdx = models.ForeignKey(User, on_delete=models.CASCADE, blank=True, null=True)
hit = models.IntegerField(default=0)
writedAt = models.CharField(max_length=20)
link = models.CharField(max_length=50)
tag = models.CharField(max_length=10)
writedAt = models.DateTimeField(auto_now_add=True)
link = models.CharField(max_length=50, default='', blank=True)
tag = models.CharField(max_length=10, choices=TAGS, default='공지')

def __str__(self):
return self.writer + ': ' + self.title
6 changes: 6 additions & 0 deletions templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,11 @@
</head>
<body>
<h1>{{ name }}은 잘생겼다!</h1>
<ul>
{% for post in posts %}
<li>{{ post.tag }} / {{ post.title }} / {{ post.writer }}</li>
{% endfor %}
</ul>

</body>
</html>

0 comments on commit b9c1bf5

Please sign in to comment.