Skip to content
This repository was archived by the owner on Sep 19, 2021. It is now read-only.

Commit 95212c8

Browse files
committed
Few Fixes
1 parent 4d52e21 commit 95212c8

File tree

2 files changed

+38
-30
lines changed

2 files changed

+38
-30
lines changed

board/forms.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@
22

33

44
class LoginForm(forms.Form):
5-
username = forms.CharField()
6-
password = forms.CharField(widget=forms.PasswordInput())
5+
username = forms.CharField(max_length=15)
6+
password = forms.CharField(
7+
max_length=20,
8+
widget=forms.PasswordInput()
9+
)
710

811

912
class RegisterForm(forms.Form):
10-
username = forms.CharField()
11-
password = forms.CharField(widget=forms.PasswordInput())
12-
first_name = forms.CharField()
13-
last_name = forms.CharField()
13+
username = forms.CharField(max_length=15)
14+
password = forms.CharField(max_length=20, widget=forms.PasswordInput())
15+
first_name = forms.CharField(max_length=30)
16+
last_name = forms.CharField(max_length=30)
1417

1518

1619
class ArticleForm(forms.Form):

board/views.py

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from django.shortcuts import get_object_or_404, render, redirect
44
from django.contrib.auth import login, authenticate, logout
55
from django.contrib.auth.models import User
6-
from django.http import HttpResponseBadRequest, HttpResponseNotFound
6+
from django.http import HttpResponse
77

88
from .models import *
99
from .forms import *
@@ -14,11 +14,13 @@ def index(req):
1414

1515

1616
def user_login(req):
17+
if req.user.is_authenticated:
18+
return HttpResponse(status=404)
1719
if req.method == 'GET':
1820
return login_form(req)
1921
if req.method == 'POST':
2022
return login_post(req)
21-
return HttpResponseNotFound()
23+
return HttpResponse(status=404)
2224

2325

2426
def login_form(req):
@@ -30,22 +32,28 @@ def login_form(req):
3032
def login_post(req):
3133
form = LoginForm(req.POST)
3234
if not form.is_valid():
33-
return HttpResponseBadRequest()
35+
return HttpResponse(status=400)
3436

3537
user = authenticate(
3638
username=form.cleaned_data['username'],
3739
password=form.cleaned_data['password'],
3840
)
39-
login(req, user)
40-
return redirect('index')
41+
42+
if user:
43+
login(req, user)
44+
return redirect('index')
45+
else:
46+
return HttpResponse(status=401)
4147

4248

4349
def register(req):
50+
if req.user.is_authenticated:
51+
return HttpResponse(status=404)
4452
if req.method == 'GET':
4553
return register_form(req)
4654
if req.method == 'POST':
4755
return register_post(req)
48-
return HttpResponseNotFound()
56+
return HttpResponse(status=404)
4957

5058

5159
def register_form(req):
@@ -57,14 +65,15 @@ def register_form(req):
5765
def register_post(req):
5866
form = RegisterForm(req.POST)
5967
if not form.is_valid():
60-
return HttpResponseBadRequest()
68+
return HttpResponse(status=400)
6169

62-
User.objects.create_user(
70+
user = User.objects.create_user(
6371
username=form.cleaned_data['username'],
6472
password=form.cleaned_data['password'],
6573
first_name=form.cleaned_data['first_name'],
6674
last_name=form.cleaned_data['last_name'],
6775
)
76+
user.save()
6877
return redirect('login')
6978

7079

@@ -91,9 +100,7 @@ def get_article_list(req, page_num):
91100

92101

93102
def get_article(req, article_id):
94-
article = get_object_or_404(Article, id=article_id)
95-
if article.is_deleted:
96-
return HttpResponseNotFound()
103+
article = get_object_or_404(Article, id=article_id, is_deleted=False)
97104

98105
return render(req, 'articles/details.html', {
99106
'article': article,
@@ -102,12 +109,12 @@ def get_article(req, article_id):
102109

103110
def compose_article(req):
104111
if not req.user.is_authenticated:
105-
return HttpResponseNotFound()
112+
return HttpResponse(status=404)
106113
if req.method == 'GET':
107114
return compose_article_form(req)
108115
if req.method == 'POST':
109116
return compose_article_post(req)
110-
return HttpResponseNotFound()
117+
return HttpResponse(status=404)
111118

112119

113120
def compose_article_form(req):
@@ -119,7 +126,7 @@ def compose_article_form(req):
119126
def compose_article_post(req):
120127
form = ArticleForm(req.POST)
121128
if not form.is_valid():
122-
return HttpResponseBadRequest()
129+
return HttpResponse(status=400)
123130

124131
new_article = Article.objects.create(
125132
title=form.cleaned_data['title'],
@@ -133,17 +140,16 @@ def compose_article_post(req):
133140

134141
def edit_article(req, article_id):
135142
if not req.user.is_authenticated:
136-
return HttpResponseNotFound()
143+
return HttpResponse(status=404)
137144

138-
article = get_object_or_404(Article, id=article_id)
139-
if req.user != article.author or article.is_deleted:
140-
return HttpResponseNotFound()
145+
article = get_object_or_404(Article,
146+
id=article_id, is_deleted=False, author=req.user)
141147

142148
if req.method == 'GET':
143149
return edit_article_form(req, article)
144150
if req.method == 'POST':
145151
return edit_article_post(req, article)
146-
return HttpResponseNotFound()
152+
return HttpResponse(status=404)
147153

148154

149155
def edit_article_form(req, article):
@@ -158,7 +164,7 @@ def edit_article_form(req, article):
158164
def edit_article_post(req, article):
159165
form = ArticleForm(req.POST)
160166
if not form.is_valid():
161-
return HttpResponseBadRequest()
167+
return HttpResponse(status=400)
162168

163169
article.title = form.cleaned_data['title']
164170
article.content = form.cleaned_data['content']
@@ -168,11 +174,10 @@ def edit_article_post(req, article):
168174

169175
def delete_article(req, article_id):
170176
if not req.user.is_authenticated:
171-
return HttpResponseNotFound()
177+
return HttpResponse(status=404)
172178

173-
article = get_object_or_404(Article, id=article_id)
174-
if req.user != article.author or article.is_deleted:
175-
return HttpResponseNotFound()
179+
article = get_object_or_404(Article,
180+
id=article_id, is_deleted=False, author=req.user)
176181

177182
article.is_deleted = True
178183
article.save()

0 commit comments

Comments
 (0)