Merge branch 'master' of http://39.104.94.153:3000/yf_zd/second

apps/Equipment/views.py

@@ -1455,11 +1455,22 @@ class My_Pub_List(ListView):
         _list = CKArticle.objects.all()
         if _type:
             _list = _list.filter(art_type=_type)
+            if _type == "6":
+                pub_list = Video_data.objects.all()
+            elif _type == "7":
+                pub_list = Product.objects.all()
+            elif _type == "8":
+                pub_list = Pick_Pub.objects.all()
+            elif _type == "9":
+                pub_list = Hotel_Info.objects.all()
+            elif _type == "10":
+                pub_list = Sightsee_Info.objects.all()
         if hidden:
             _list = _list.filter(hidden=hidden)
+            pub_list = pub_list.filter(hidden=hidden)
         nums = _list.count()
         art_list = _list[(10*(page-1)):(page*10)]
-        return render(request, 'backstageNet/infoList/myPubList.html', context={"art_list":art_list,"nums":nums})
+        return render(request, 'backstageNet/infoList/myPubList.html', context={"pub_list":pub_list,"art_list":art_list,"nums":nums,"type":_type})
     def post(self,request):
         pass