diff --git a/safesite/edu/views.py b/safesite/edu/views.py index 73f4c662..74aa8c4a 100644 --- a/safesite/edu/views.py +++ b/safesite/edu/views.py @@ -80,10 +80,10 @@ def api(req): startnum,endnum=fenye(req) a = a.order_by('-downnum','-modifytime')[startnum:endnum].values('id','num','title','user__name','user__ubelongpart__partname','desciption','submittime','type','cate__name','url','downnum','modifytime') return HttpResponse(transjson(total,a),content_type="application/json") - # elif a == 'detail': - # id = req.GET.get('eduid') - # obj = Edulesson.objects.filter(id=id).values('id','num','title','user__name','user__ubelongpart__partname','desciption','submittime','type','cate__name','url','downnum','modifytime') - # return JsonResponse(list(obj)[0]) + elif a == 'detail': + id = req.GET.get('eduid') + obj = Edulesson.objects.filter(id=id).values('id','num','title','user__name','user__ubelongpart__partname','desciption','submittime','type','cate__name','url','downnum','modifytime') + return JsonResponse(list(obj)[0]) #视频 elif a=='add': userid = req.session['userid']#用户ID @@ -167,7 +167,7 @@ def api(req): obj.save() return JsonResponse({"code":1,"url": a.url}) #观看详情 - elif a=='detail': + elif a=='watch_detail': id=req.GET.get('eduid') userid = req.session['userid'] companyid = getcompany(userid)#公司ID diff --git a/safesite/templates/edulessondetail.html b/safesite/templates/edulessondetail.html index d6de5d5b..bd01cfa1 100644 --- a/safesite/templates/edulessondetail.html +++ b/safesite/templates/edulessondetail.html @@ -10,7 +10,7 @@ var html; $('#eduwatchtable').datagrid({ - url: 'edu/api?a=detail&eduid=' + eduid, + url: 'edu/api?a=watch_detail&eduid=' + eduid, rownumbers: true, singleSelect: true, striped: true, diff --git a/safesite/urls.py b/safesite/urls.py index 748c5023..c5fd2e9c 100644 --- a/safesite/urls.py +++ b/safesite/urls.py @@ -189,6 +189,7 @@ urlpatterns = [ path('api/rights',views.apirights), path('api/socert',views.apisocert), path('api/user',views.apiuser), + path('api/get_user_from_username', views.get_user_from_username), path('api/partuser',views.apipartuser), path('api/duibiao',views.apiduibiao), path('api/suggest',views.apisuggest), diff --git a/safesite/views.py b/safesite/views.py index 46e1467e..88688b0e 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -4701,6 +4701,15 @@ def apipartuser(req): 'checked': False, 'isPeople': True, 'children': []}) return JsonResponse({"code": 1, "data": lst}) +def get_user_from_username(req): + username = req.GET.get('username') + if username: + objs = User.objects.filter(username=username) + if objs.exists(): + userdata = objs.values('name','username','ubelongpart__partname','usecomp__partname') + return JsonResponse({"code": 1, "data": list(userdata)[0]}) + return JsonResponse({"code":0}) + @apicheck_login def apiuser(req): a = req.GET.get('a')