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

UserManage/urls.py

@@ -7,8 +7,9 @@ urlpatterns = patterns('UserManage.views',
 
     url(r'^user/add/$', 'user.AddUser', name='adduserurl'),
     #url(r'^user/addadmin/$', 'user.AddAdmin', name='addadminurl'),
-    url(r'^user/removes/$', 'user.RemoveUsers', name='removesusersurl'),
-    url(r'^user/ipid/removes/(?P<ID>\d+)/$', 'user.RemoveUsers_ByIpid', name='removesusersbyipid'),
+    url(r'^user/removes/rm/$', 'user.RemoveUsers', name='removesusersurl'),
+    url(r'^user/removes/ipid/(?P<ID>\d+)/$', 'user.RemoveUsers_ByIpid', name='removesusersbyipid'),
+    url(r'^user/removes/ipidexp/(?P<ID>\d+)/$', 'user.ExpUsers_ByIpid', name='expusersbyipid'),
     url(r'^user/addxls/$', 'user.XLSFileUser', name='addxlsuserurl'),
     url(r'^user/list/$', 'user.ListUser', name='listuserurl'),
     #url(r'^user/listnew/$', 'user.ListNewUser', name='listnewuserurl'),

UserManage/views/user.py

@@ -323,6 +323,16 @@ def RemoveUsers_ByIpid(request,ID):
         kwvars = {'request':request,'xerror':e,}
         return render_to_response('UserManage/user.remove.error.html',kwvars,RequestContext(request))
 
+@login_required
+@PermissionVerify()
+def ExpUsers_ByIpid(request,ID):
+    try:
+        uobj = User.objects.filter(ipid=ID)[:10]
+        lst=map(lambda x:str(x.sid)+"   "+str(x.nickname),uobj)
+        ret="<br />".join(lst)
+        return HttpResponse(ret)
+    except Exception,e:
+        return HttpResponse("错误："+e)
 
 @login_required
 def ChangInfo(request):

templates/UserManage/user.list.html

@@ -70,7 +70,7 @@
 
     {% include "common/paginator.html" %}
 
-    <div class="modal fade" id="modalDelByIpid" tabindex="-1" role="dialog" aria-labelledby="modalDelByIpidLabel">
+<div class="modal fade" id="modalDelByIpid" tabindex="-1" role="dialog" aria-labelledby="modalDelByIpidLabel">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
@@ -84,14 +84,45 @@
         </div>
         
         <div id="confirmbox" style="display:none;">
-
+            <h3>以下是该批次导入的部分用户，请确认这是不是您想要删除的批次：</h3>
+            <blockquote id="confirmdisp">
+                
+            </blockquote>
         </div>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-        <button type="button" class="btn btn-primary">提交</button>
+        <button id="dip_next" type="button" style="display:block;" class="btn btn-primary">下一步</button>
+        <button id="dip_commit" type="button" style="display:none;" class="btn btn-primary">提交</button>
       </div>
     </div>
   </div>
 </div>
+<script type="text/javascript">
+    window.jurl = "{% url 'removesusersbyipid' 233333 %}";
+    window.eurl = "{% url 'expusersbyipid' 233333 %}";
+    $('#myModal').on('hidden.bs.modal', function (e) {
+        $("iptbox").css("display","block");
+        $("confirmbox").css("display","none");
+        $("#d_ipid_1").val("");
+        $("#d_ipid_2").val("");
+        $("dip_next").css("display","block");
+        $("dip_commit").css("display","none");
+    });
+    $("#dip_next").click(function(){
+        if($("d_ipid_1").val()==$("d_ipid_2").val()){
+            window.jpipid = $("d_ipid_1").val();
+            $("iptbox").css("display","none");
+            $("confirmbox").css("display","block");
+            $("dip_next").css("display","none");
+            $("dip_commit").css("display","block");
+            $("#confirmdisp").html("正在载入...");
+            $("#confirmdisp").load(window.jurl.replace(/23333/,window.jpipid));
+        }
+    });
+    $("#dip_next").click(function(){
+        window.location.href = window.jurl.replace(/23333/,window.jpipid);
+    });
+    
+</script>
 {% endblock %}