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

apps/Equipment/views.py

@@ -267,6 +267,9 @@ class Equip_Show_Detail(ListView):
     def get(self,request):
         e_id = request.GET.get("id")
         product = Product.objects.get(id=e_id)
+        e_name = request.GET.get("name")
+        if e_name:
+            product = Product.objects.get(title=e_name)
         return render(request, 'outerNet/exhibitionDetail.html', context={"product":product})
     def post(self,request):
         pass
@@ -301,6 +304,9 @@ class Garden_Intro(ListView):
     def get(self,request):
         pid = request.GET.get("id")
         pick = Pick_Pub.objects.get(id=pid)
+        pname = request.GET.get("name")
+        if pname:
+            pick = Pick_Pub.objects.get(name=pname)
         return render(request, 'outerNet/pickIntro.html', context={"pick":pick})
     def post(self,request):
         pass
@@ -329,6 +335,9 @@ class Tourist(ListView):
     def get(self,request):
         sid = request.GET.get("id")
         sightsee = Sightsee_Info.objects.get(id=sid)
+        sname = request.GET.get("name")
+        if sname:
+            sightsee = Sightsee_Info.objects.get(name=sname)
         return render(request, 'outerNet/tourist.html', context={"sightsee":sightsee})
     def post(self,request):
         pass
@@ -370,6 +379,9 @@ class Dorm_Detail(ListView):
         hotel_id = request.GET.get("id")
         hotel = Hotel_Info.objects.get(id=hotel_id)
         photos = Hotel_Photo.objects.filter(hotel=hotel)
+        hotel_name = request.GET.get("name")
+        if hotel_name:
+            hotel = Hotel_Info.objects.get(name=hotel_name)
         return render(request, 'outerNet/hotelDetail.html', context={"hotel":hotel,"photos":photos})
     def post(self,request):
         pass
@@ -410,6 +422,9 @@ class Video_Detail(ListView):
     def get(self,request):
         v_id = request.GET.get("id")
         video = Video_data.objects.get(id=v_id)
+        v_name = request.GET.get("name")
+        if v_name:
+            video = Video_data.objects.get(title=v_name)
         return render(request, 'outerNet/videoDetail.html', context={"video":video})
     def post(self,request):
         pass
@@ -3885,5 +3900,4 @@ class Equip_Location(ListView):
             equip_obj.lng = lng
             equip_obj.lat = lat
             equip_obj.save()
-        data = json.dumps(data)
-        return HttpResponse(data)
+        return HttpResponse("1")