Explorar el Código

home民宿参数

yf_zd hace 5 años
padre
commit
e521b82c23
Se han modificado 2 ficheros con 4 adiciones y 4 borrados
  1. 3 3
      apps/Home/views.py
  2. 1 1
      templates/backstageNet/info/newsPub.html

+ 3 - 3
apps/Home/views.py

@@ -139,7 +139,7 @@ class Home(View):
         else:
             curr_user = ""
         return render(request, 'outerNet/index.html', context={"user_news": user_news,"zero_news": zero_news, "one_news": one_news,
-                                                               "two_news": two_news, "video_news": video_news,"hotel":user,
+                                                               "two_news": two_news, "video_news": video_news,"hotel":hotel,
                                                                "product": product, "pick": pick, "farm": farm, "curr_user": curr_user})
 
     def post(self, request):
@@ -156,7 +156,7 @@ class Home2(View):
         product = Product.objects.all()[0:8]
         pick = Pick_Pub.objects.all()[0:6]
         farm = FarmList.objects.all()[0:6]
-        user = Hotel_Info.objects.all()[0:5]
+        hotel = Hotel_Info.objects.all()[0:5]
         if request.user.is_authenticated():
             user_name = request.user.username
             curr_user = MyUser.objects.get(username=user_name)
@@ -165,7 +165,7 @@ class Home2(View):
         else:
             curr_user = ""
         return render(request, 'outerNet/index2.html', context={"user_news": user_news,"zero_news": zero_news, "one_news": one_news,
-                                                               "two_news": two_news, "video_news": video_news,"hotel":user,
+                                                               "two_news": two_news, "video_news": video_news,"hotel":hotel,
                                                                "product": product, "pick": pick, "farm": farm, "curr_user": curr_user})
 
     def post(self, request):

+ 1 - 1
templates/backstageNet/info/newsPub.html

@@ -340,7 +340,7 @@
                 toolbar:
                     [
                         ['Undo', 'Redo'],
-                        ['Styles', 'FontSize', 'Format', 'JustifyLeft ', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
+                        ['Styles', 'FontSize', 'Format', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
                         ['Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Image']
                     ]
             }