From 3b448e04d73d24d0edff87e7230279facc9d0755 Mon Sep 17 00:00:00 2001
From: gothack329 <gothack.329@gmail.com>
Date: Sat, 24 Mar 2018 22:01:55 +0800
Subject: [PATCH] fix update bug

---
 article/views.py               |   9 +++++++++
 db.sqlite3                     | Bin 380928 -> 393216 bytes
 edconline/settings.py          |   2 +-
 static/bootstrap/css/style.css |  12 +++++++-----
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/article/views.py b/article/views.py
index 07b800e..2726d28 100644
--- a/article/views.py
+++ b/article/views.py
@@ -4,6 +4,8 @@
 from django.contrib import messages
 from .models import *
 from userpage.models import *
+from django.contrib.auth.decorators import login_required
+from django.db import transaction
 
 
 # Create your views here.
@@ -83,8 +85,15 @@ def publish(request):
     return render(request,'article/publish.html',{'article_form':article_form,'operation':'发布'})
 
 
+@login_required
+@transaction.atomic
 def update(request, article_id):
     art = Article.objects.get(pk=article_id)
+    if request.user.username == art.author_id.user.username:
+        pass
+    else:
+        return redirect('/article/%d/' % (article_id,))
+
     if request.method == 'POST':
         article_form = ArticleForm(request.POST,request.FILES,instance=art)
 
diff --git a/db.sqlite3 b/db.sqlite3
index 2b886c771f47c4403dcdd879fd7be11424a62247..a77d3cc1f67a0bb8119753ff4d74542a073d5351 100644
GIT binary patch
delta 1035
zcmbVLU1(HC6uvWaX7BFay)(PDv1^l>O;qU3CYyV2w#jZln@H({(KW3v+uf*J(p2)0
zpJD`QsVqr<QiR4d$g~w?g+6FSh>6*WAW7(3?NcSTuYpqW$%0_OMtVDY>q}{#%5ctM
z=6vUz@0`PwD=(GH@eB3llBQ`TB?C&x?5ka9>1JtP3Ki!*OBMGfU$jUY8XcP$et&rI
z-HG9`(UT*mPg%x3QjZ45Mn;B4C-PIY{d3xmlwe8QiI*Tb)++RVatX86MJF+B1}H%&
zo|o<kaxd1Pyc++LH}IY8FZKhw!>Vkaeb2sQmszXaJx-38V&r48>IVf?&^dAsNwC4-
zIB$vA40&vvoP7An^6zsu{<!mnj9rHgEDturj}cM+nrv1p1fpSL<}|**JTs>l^qAIE
zDj(5M@26)PgLQR?$6edWwAmePj+?ME-L})6&ZM%P_G_+a`hf1lomp{r65bF~tE559
z%m5XGXXy^H@gW@)=Vu_~U-fkJfkbgnr}%ji_KSxf(cR+GDyhT4ob*-*Z6Zl_Rp=Y!
z7^nuXE;>DjSTv9X4IwKYXz?wU%a6$6m_lB=sDlFDWY-k1k41GrHC*x^i(BMv27R$$
zl6e}BaVo+I=*P^HSAHSCA=&dbtVAOIn3FY)TZGXLPgPz|=(bACDf1R%r7O$_Sw6^W
zk;d!rBpNo=>Jh)M@%sw$6Hi*jfSMJm_x?MjY|6=GGF=_Jo^QWe0*I2LxheE<Xv5|+
z5iFBNacmq;VRKWWU&)luZpkoeyml3Vgit}Eb3k4oR(MG07vL=%9#UH}!h4!5s)+RF
zbK4cRT{oT1%IR<6EY)k23);HS=iwGwpPh{-twKNx^@bX^3w1iv*{;lU%0ur-Zype5
z)NgxBY3)tECD=UN_+P1>`I-6()iv;rqV8&xt~h9iT<xWY7+RCzep-$oL!KX?E(!;R
z(SFReVhD@W0F8@{<Md^`j^);I8geC6;1OrpcQA3>u9U5gV^k|tkA|>fc|u7+Hq8+m
s%bo?g_DZDo(0t&*#cv*bIbHh+Y32BeteG`OX*)-?0*^WC{#Sv&0faRVod5s;

delta 563
zcmW-d&ubGw6vub=&2*b&Gn*}HrB#g8U?McX6ap&Rig>UVQ$!>-X(OeUQ1S!J!HZ?7
zVk1J04PnrN<dBmf*jDlqs5SNIG5!I1v3gRhCly>L^7vdn4D)^OYgzlPT7P-aT~`z(
zB}q!uC;k|zucduKlBhfgP96>H3BWMP<%^kHnVFl#Og=ZAy*=l5`CyRD<g?k?T=Dun
z7FuE<B2kfr!1ls8j|wdgs~Zt-*^SXD=$Hf2DaLQ(fU%GN<?r|=Z}3<A1+Vkx=q<pw
zTg=~u?H+F=9QK{Y=mK;I_zhEN7EElI=@u8}W7u_!4V~SoKHXU^p}ERVsyNbNZFi#v
z)YGeSTQSzTEnolSXm0^K3<2I0+9$Xw-4w^>H@Iv{*Q#o?tEM@&I2|*40)|VGS-O|T
zaqSrWLU3dS-s{2@qQ8(@;4;uSM}K&@tmxF@*Za-Sm6zW)A9i;*q2l==`bI}@8C23p
zQ|f^PCqgUGVbN>BA#trh=g{=irT@RST}T!v^nu@55?Yx~$d1BJEIp%lSfk8#jlHpi
z3Xy0m7?u-px@BZSv4vKnuPck53uxCUF&b@ZUm+J89<~)BefV~iUE*XLopEOAM8`)-
z7A3ltA>@o|D3cD=Awo&kFFvN&0QrD_Qp^#Rcd=QnS_zTM!EvlEvw5;&QKU5n9tV-J
QH@e{H5gL{~ue0{Sf0@3gRR910

diff --git a/edconline/settings.py b/edconline/settings.py
index 10dc7ca..cca0f16 100644
--- a/edconline/settings.py
+++ b/edconline/settings.py
@@ -27,7 +27,7 @@
 DEBUG = True
 
 ALLOWED_HOSTS = ['*']
-
+LOGIN_URL = '/userpage/login/'
 
 # Application definition
 
diff --git a/static/bootstrap/css/style.css b/static/bootstrap/css/style.css
index 6a3b7ea..f286862 100755
--- a/static/bootstrap/css/style.css
+++ b/static/bootstrap/css/style.css
@@ -1,4 +1,7 @@
-
+@media (min-width:500px){
+.container{width:480px}
+.banner{height:300px}
+}
 
 html,body {
     background-color:#f6f8fa;
@@ -72,7 +75,6 @@ ul.nav.navbar-nav  li a:hover {
 
 div.container-fluid {
 	margin:0;
-
 	position:relative;
     min-height:100%;
     /*设置padding-bottom值大于等于footer的height值，以保证main的内容能够全部显示出来而不被footer遮盖；*/
@@ -81,7 +83,7 @@ div.container-fluid {
 }
 
 .container {
-	width:80%;
+	min-width:80%;
 }
 
 .sidebar , .content {
@@ -91,7 +93,7 @@ div.container-fluid {
 .card {
 	width:100%;
 	padding:10px;
-	margin:10px;
+	margin-top:10px;
 	border: 1px solid #e2e2e2;
 	box-shadow: 1px 1px 1px 1px #e2e2e2;
 	background-color:white;
@@ -268,4 +270,4 @@ footer, footer a{
 .foot-wrap .foot-top ul li {
 	float:left;
 	padding-right:20px;
-}
+}