Revert "Revert "Signed-off-by: zry <admin@z-touhou.org>""

This reverts commit 268a8f13fbd65c7fd9ce673ab6b17998a69cda5e.

templates/home.html

@@ -7,10 +7,11 @@
 {% block content %}
 <div class="well well-lg">
     <h1>邵武一中第五届摄影大赛</h1>
-    <p>投票日期：2015-09-28 ~ 2015-10-03</p>
+    <!-- <p>投票日期：2015-09-28 ~ 2015-10-03</p> -->
+    <p><strong>提示：投票截止时间已到，不能再投票了</strong></p>
     <p>作品汇集及整理：刘长涛、陈思楠</p>
     <p>数据处理：刘长涛、张若岩</p>
-    <p>欢迎大家踊跃投票~</p>
+    <!-- <p>欢迎大家踊跃投票~</p> -->
     <p><strong>注意：刷票属于违规行为，如经发现，主办方有权取消该作品的参赛资格！</strong></p>
 </div>
 <div class="panel panel-info hidden-sm hidden-xs">

templates/vote/pw.view.html

@@ -35,7 +35,7 @@
         <tr>
           <th>投票</th>
           {% if user.is_authenticated %}
-          <td>
+<!--           <td>
             {% if hadvoted %}
                 您之前已经投票给作品<code>{{votedpw}}</code>了。不过如果您更喜欢这幅作品，您也可以
                 <a href="{%url 'votephoto' pwobj.uuid %}" role="button" class="btn btn-xs btn-primary">放弃之前的选择，重新投票给本作品</a>
@@ -43,7 +43,8 @@
                 如果您喜欢这幅作品，请
                 <a href="{%url 'votephoto' pwobj.uuid %}" role="button" class="btn btn-xs btn-primary">投票给本作品</a>
             {% endif %}
-          </td>
+          </td> -->
+          <td>投票截止时间已到，不能再投票。</td>
           {% else %}
           <td>
             您需要<a href="{% url 'loginurl' %}">登陆</a>方可进行投票操作。

vote/views.py

@@ -201,33 +201,35 @@ def FrontListPhotoWorks(request):
 	return render_to_response('vote/pw.flist.html',kwvars,RequestContext(request))
 
 def VotePhotoWorks(request,uuid):
-	try:
-		pwobj = PhotoWorks.objects.get(uuid=uuid)
-		if request.method=='POST':
-			chkpr=CheckPOST(['comment',],request.POST.keys())
-			if not chkpr == "" :
-				kwvars = {"msg":"投票失败","detail":"POST参数错误","error":"Invalid POST Data. Field '"+chkpr+"' Not Found."}
-				return render_to_response('error.html',kwvars,RequestContext(request))
-			cmt = request.POST['comment']
-			try:
-				vrobj = VoteRecords.objects.get(voter=request.user)
-				oldpw = vrobj.target
-				vrobj.target = pwobj
-				vrobj.comment = cmt
-				vrobj.save()
-				oldpw.score = VoteRecords.objects.filter(target=oldpw).count()
-				oldpw.save()
-			except VoteRecords.DoesNotExist:
-				vrobj = VoteRecords.objects.create(voter=request.user,target=pwobj,comment=cmt)
-			pwobj.score = VoteRecords.objects.filter(target=pwobj).count()
-			pwobj.save()
-			return HttpResponseRedirect(reverse('pwflist'))
-		else:
-			kwvars = {'request':request,'pwobj':pwobj,'pwurl':settings.PHOTO_DIR_URL}
-			return render_to_response('vote/pw.vote.html',kwvars,RequestContext(request))
-	except PhotoWorks.DoesNotExist:
-		kwvars = {"msg":"404 作品不存在","detail":"您所投票的摄影作品不存在","error":"PhotoWorks '%s' Not Found."%uuid}
-		return render_to_response('error.html',kwvars,RequestContext(request))
+	kwvars = {"msg":"投票截止时间到","detail":"投票截止时间到，您不能再投票了","error":"投票截止时间到，您不能再投票了。"}
+	return render_to_response('error.html',kwvars,RequestContext(request))
+	# try:
+	# 	pwobj = PhotoWorks.objects.get(uuid=uuid)
+	# 	if request.method=='POST':
+	# 		chkpr=CheckPOST(['comment',],request.POST.keys())
+	# 		if not chkpr == "" :
+	# 			kwvars = {"msg":"投票失败","detail":"POST参数错误","error":"Invalid POST Data. Field '"+chkpr+"' Not Found."}
+	# 			return render_to_response('error.html',kwvars,RequestContext(request))
+	# 		cmt = request.POST['comment']
+	# 		try:
+	# 			vrobj = VoteRecords.objects.get(voter=request.user)
+	# 			oldpw = vrobj.target
+	# 			vrobj.target = pwobj
+	# 			vrobj.comment = cmt
+	# 			vrobj.save()
+	# 			oldpw.score = VoteRecords.objects.filter(target=oldpw).count()
+	# 			oldpw.save()
+	# 		except VoteRecords.DoesNotExist:
+	# 			vrobj = VoteRecords.objects.create(voter=request.user,target=pwobj,comment=cmt)
+	# 		pwobj.score = VoteRecords.objects.filter(target=pwobj).count()
+	# 		pwobj.save()
+	# 		return HttpResponseRedirect(reverse('pwflist'))
+	# 	else:
+	# 		kwvars = {'request':request,'pwobj':pwobj,'pwurl':settings.PHOTO_DIR_URL}
+	# 		return render_to_response('vote/pw.vote.html',kwvars,RequestContext(request))
+	# except PhotoWorks.DoesNotExist:
+	# 	kwvars = {"msg":"404 作品不存在","detail":"您所投票的摄影作品不存在","error":"PhotoWorks '%s' Not Found."%uuid}
+	# 	return render_to_response('error.html',kwvars,RequestContext(request))
 
 @login_required
 def PersonalVoteRec(request):