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 2b886c7..a77d3cc 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ 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; -} +}