|
@@ -1910,16 +1910,16 @@ class Farm_Check_List(ListView):
|
|
|
#删除
|
|
#删除
|
|
|
if req == "del":
|
|
if req == "del":
|
|
|
i = GardenArea.objects.get(id=art_id)
|
|
i = GardenArea.objects.get(id=art_id)
|
|
|
- ckobj = CKArticle.objects.get(title=i.name)
|
|
|
|
|
- ckobj.delete()
|
|
|
|
|
|
|
+ # ckobj = CKArticle.objects.get(title=i.name)
|
|
|
|
|
+ # ckobj.delete()
|
|
|
art_obj.delete()
|
|
art_obj.delete()
|
|
|
data = "1"
|
|
data = "1"
|
|
|
#审核通过
|
|
#审核通过
|
|
|
elif req == "check1":
|
|
elif req == "check1":
|
|
|
art_obj = GardenArea.objects.get(id=art_id)
|
|
art_obj = GardenArea.objects.get(id=art_id)
|
|
|
- ckobj = CKArticle.objects.get(title=art_obj.name)
|
|
|
|
|
- ckobj.hidden = True
|
|
|
|
|
- ckobj.save()
|
|
|
|
|
|
|
+ # ckobj = CKArticle.objects.get(title=art_obj.name)
|
|
|
|
|
+ # ckobj.hidden = True
|
|
|
|
|
+ # ckobj.save()
|
|
|
art_obj.hidden = True
|
|
art_obj.hidden = True
|
|
|
art_obj.save()
|
|
art_obj.save()
|
|
|
data = "1"
|
|
data = "1"
|
|
@@ -3330,14 +3330,14 @@ class Person_Farm_Edit(ListView):
|
|
|
current_user = MyUser.objects.get(username=username)
|
|
current_user = MyUser.objects.get(username=username)
|
|
|
try:
|
|
try:
|
|
|
gar_area = GardenArea.objects.get(user=current_user)
|
|
gar_area = GardenArea.objects.get(user=current_user)
|
|
|
- data = {"name":gar_area.name,"manage":gar_area.manage,"mobile":gar_area.mobile,
|
|
|
|
|
|
|
+ data = {"id":current_user.id,"name":gar_area.name,"manage":gar_area.manage,"mobile":gar_area.mobile,
|
|
|
"area":gar_area.area,"location":gar_area.location,"addr":gar_area.addr,
|
|
"area":gar_area.area,"location":gar_area.location,"addr":gar_area.addr,
|
|
|
"desc":gar_area.desc,"img":gar_area.img,"guide_img":gar_area.guide_img
|
|
"desc":gar_area.desc,"img":gar_area.img,"guide_img":gar_area.guide_img
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
except Exception as e:
|
|
except Exception as e:
|
|
|
print(e)
|
|
print(e)
|
|
|
- data = {"name":"","manage":"","mobile":"",
|
|
|
|
|
|
|
+ data = {"id":"","name":"","manage":"","mobile":"",
|
|
|
"area":"","location":"","addr":"",
|
|
"area":"","location":"","addr":"",
|
|
|
"desc":"","img":"","guide_img":""
|
|
"desc":"","img":"","guide_img":""
|
|
|
}
|
|
}
|