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

apps/Equipment/urls.py

@@ -255,6 +255,8 @@ urlpatterns = [
     url(r'^garden_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\garden_photo'}), #本地
     url(r'^guser_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\guser_photo'}), #本地
     url(r'^map_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\map_photo'}), #本地
+    url(r'^media/uploads/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\media\\uploads'}), #本地
+    
     
 
     # url(r'^hotel_photo/(?P<path>.*)', serve, {'document_root': '/home/web/second/second/hotel_photo'}), #本地

apps/Equipment/views.py

@@ -2007,6 +2007,8 @@ class CKArticle_View(ListView):
         content = request.POST.get('content')
         try:
             # CKArticle.objects.create(auther=current_user.username,art_type=art_type,writer=writer,intro=intro,title=title,content=content,head_img=news_photo)
+            if art_type == "5":
+                return HttpResponse("1")
             CKArticle.objects.create(art_type=art_type,writer=writer,intro=intro,title=title,content=content,head_img=news_photo)
             data = "1"
         except Exception as e:
@@ -3841,4 +3843,23 @@ class Add_Relation_List(ListView):
         partner = partner[(10*(page-1)):(page*10)]
         return render(request, 'backstageNet/systemSet/partnersList.html', context={"partner":partner,"nums":nums})
     def post(self, request):
-        pass
+        pass
+    
+    
+    
+
+class Equip_Addr(ListView):
+    def get(self,request):
+        pass
+    def post(self, request):
+        username = request.user.username
+        print('username:',username)
+        user = MyUser.objects.get(username=username)
+        if user.is_staff == True:
+            equip_list = Equip.objects.all()
+        else:
+            equip_list = Equip.objects.filter(equip_user=user)
+        data = []
+        for i in equip_list:
+            pass
+