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

UserManage/views/user.py

@@ -350,7 +350,7 @@ def RemoveUsers(request):
 @PermissionVerify()
 def RemoveUsers_ByIpid(request,ID):
     try:
-        uobj = User.objects.filter(importid=ID).delete()
+        User.objects.filter(importid=ID).delete()
         return HttpResponseRedirect(reverse("listuserurl"))
     except Exception,e:
         kwvars = {'request':request,'xerror':e,}

templates/sidebar.html

@@ -62,6 +62,12 @@
                     <a href="{% url 'contestantslist' %}">参赛人员管理</a>
                 </td>
             </tr>
+            <tr>
+                <td>
+                    <span class="glyphicon glyphicon-camera btn-xs"></span>
+                    <a href="{% url 'pwlist' %}">参赛作品管理</a>
+                </td>
+            </tr>
             <tr>
                 <td>
                     <span class="glyphicon glyphicon-list-alt btn-xs"></span>

templates/vote/contestant.list.html

@@ -45,7 +45,7 @@
                     <td>{{ i.sid }}</td>
                     <td>{{ i.classid }}</td>
                     <td class="host_buttom">
-                        <a class="btn btn-danger btn-xs" href={% url "deletecturl" i.id %} onclick="return confirm('是否确认删除？')">删除</a>
+                        <a class="btn btn-danger btn-xs" href={% url "pwdel" i.id %} onclick="return confirm('是否确认删除？')">删除</a>
                     </td>
                 </tr>
             {% endfor %}

templates/vote/pw.list.html

@@ -17,8 +17,7 @@
     <div class="btn-toolbar">
         <div class="btn-group">
             {% url "pwlist" as pwlist %}
-            <a class="btn btn-default {%if request.path = pwlist%} active {%endif%}" href={{ pwlist }}><span class="glyphicon glyphicon-list"></span>参赛作品列表</a>
-            {% url "removesusersurl" as theremovesusersurl %}
+            <a class="btn btn-default {%if request.path = pwlist%} active {%endif%}" href="{{ pwlist }}"><span class="glyphicon glyphicon-list"></span>参赛作品列表</a>
             <a class="btn btn-default" type="button" data-toggle="modal" data-target="#modalDelByIpid"><span class="glyphicon glyphicon-shopping-cart"></span>按导入批号删除</a>
         </div>
     </div>
@@ -46,8 +45,8 @@
                     <td>{{ i.importid }}</td>
                     <td>{{ i.score }}</td>
                     <td class="host_buttom">
-                        <a class="btn btn-warning btn-xs"  href={% url "edituserurl" i.id %} target="_blank">查看</a>
-                        <a class="btn btn-danger btn-xs" href={% url "deleteuserurl" i.id %} onclick="return confirm('是否确认删除？')">删除</a>
+                        <a class="btn btn-warning btn-xs"  href={% url "pwview" i.uuid %} target="_blank">查看</a>
+                        <a class="btn btn-danger btn-xs" href={% url "pwdel" i.id %} onclick="return confirm('是否确认删除？')">删除</a>
                     </td>
                 </tr>
             {% endfor %}
@@ -85,8 +84,8 @@
   </div>
 </div>
 <script type="text/javascript">
-    window.jurl = "{% url 'removesusersbyipid' 233333 %}";
-    window.eurl = "{% url 'expusersbyipid' 233333 %}";
+    window.jurl = "{% url 'pwipidrm' 233333 %}";
+    window.eurl = "{% url 'pwipidv' 233333 %}";
     $('#modalDelByIpid').on('hidden.bs.modal', function (e) {
         $("#iptbox").css("display","block");
         $("#confirmbox").css("display","none");

templates/vote/pw.view.html

@@ -10,38 +10,4 @@
 {% url "ms_lmform" as leavemsgurl %}
 {% url "cs_ubook" as counselurl %}
 
-    <div class="well well-lg">
-    <h1>开发顺利进行中，系统即将上线~</h1>
-    </div>
-
-<div class="section">
-
-    	<div class="row">
-    		<div class="col-md-4 col-sm-6">
-    			<div class="service-wrapper">
-        			<img src="/static/img/large_icons/chat.png" alt="Service 1">
-        			<h3>作品欣赏与投票</h3>
-        			<p>欣赏参赛选手的作品并进行投票</p>
-        			<a class="btn btn-default" href=""  role="button">开始投票 &raquo;</a>
-        		</div>
-    		</div>
-    		<div class="col-md-4 col-sm-6">
-    			<div class="service-wrapper">
-        			<img src="/static/img/large_icons/box.png" alt="Service 1">
-        			<h3>投票记录</h3>
-        			<p>查看我的投票记录</p>
-        			<a class="btn btn-default" href="" role="button">查看投票记录 &raquo;</a>
-        		</div>
-    		</div>
-    		<div class="col-md-4 col-sm-6">
-    			<div class="service-wrapper">
-        			<img src="/static/img/large_icons/ruler.png" alt="Service 1">
-        			<h3>我的作品</h3>
-        			<p>查看自己的作品的得票情况</p>
-        			<a class="btn btn-default" href="" role="button">查看我的作品 &raquo;</a>
-        		</div>
-    		</div>
-    	</div>
-
-</div>
 {% endblock %}

vote/urls.py

@@ -3,10 +3,12 @@ from django.conf.urls import patterns, include, url
 urlpatterns = patterns('vote.views',
     url(r'^system/restart/$', 'sysRestart', name='sys_restart'),
     url(r'^admin/contestant/list/$', 'ListContestants', name='contestantslist'),
-    url(r'^admin/contestant/delete/(?P<ID>\d+)/$', 'DeleteContestant', name='deletecturl'),
+    url(r'^admin/contestant/delete/id/(?P<ID>\d+)/$', 'DeleteContestant', name='ctdel'),
     url(r'^admin/photoworks/emptyxls/gen$', 'GenEmptyXLS', name='pwemptyxlsgen'),
     url(r'^admin/photoworks/list/$', 'ListPhotoWorks', name='pwlist'),
     url(r'^admin/photoworks/view/(?P<uuid>\w+)/$', 'ViewPhotoWorks', name='pwview'),
-
+    url(r'^admin/photoworks/delete/id/(?P<ID>\d+)/$', 'DeletePhotoWorks', name='pwdel'),
+    url(r'^admin/photoworks/delete/ipid/(?P<ID>\d+)/$', 'RemovePW_ByIpid', name='pwipidrm'),
+    url(r'^admin/photoworks/delete/veip/(?P<ID>\d+)/$', 'ExpPW_ByIpid', name='pwipidv'),
 
 )

vote/views.py

@@ -76,6 +76,33 @@ def ListPhotoWorks(request):
 
     return render_to_response('UserManage/pw.list.html',kwvars,RequestContext(request))
 
+@login_required
+@PermissionVerify()
+def DeletePhotoWorks(request,ID):
+    PhotoWorks.objects.filter(id = ID).delete()
+    return HttpResponseRedirect(reverse('pwlist'))
+
+@login_required
+@PermissionVerify()
+def RemovePW_ByIpid(request,ID):
+    try:
+        PhotoWorks.objects.filter(importid=ID).delete()
+        return HttpResponseRedirect(reverse("pwlist"))
+    except Exception,e:
+        kwvars = {"msg":"按批号删除作品失败","detail":"按批号删除作品失败","error":str(e)}
+		return render_to_response('error.html',kwvars,RequestContext(request))
+
+@login_required
+@PermissionVerify()
+def ExpPW_ByIpid(request,ID):
+    try:
+        pwobj = PhotoWorks.objects.filter(importid=ID)[:10]
+        lst=map(lambda x:unicode(x.author.user.username)+u"   "+unicode(x.title),pwobj)
+        ret=u"<br />".join(lst)
+        return HttpResponse(ret)
+    except Exception,e:
+        return HttpResponse(u"错误："+unicode(e))
+
 def ViewPhotoWorks(request,uuid):
 	try:
 		pwobj = PhotoWorks.objects.get(uuid=uuid)