This commit is contained in:
commit
fdea19a4d7
|
@ -80,10 +80,10 @@ def api(req):
|
||||||
startnum,endnum=fenye(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')
|
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")
|
return HttpResponse(transjson(total,a),content_type="application/json")
|
||||||
# elif a == 'detail':
|
elif a == 'detail':
|
||||||
# id = req.GET.get('eduid')
|
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')
|
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])
|
return JsonResponse(list(obj)[0])
|
||||||
#视频
|
#视频
|
||||||
elif a=='add':
|
elif a=='add':
|
||||||
userid = req.session['userid']#用户ID
|
userid = req.session['userid']#用户ID
|
||||||
|
@ -167,7 +167,7 @@ def api(req):
|
||||||
obj.save()
|
obj.save()
|
||||||
return JsonResponse({"code":1,"url": a.url})
|
return JsonResponse({"code":1,"url": a.url})
|
||||||
#观看详情
|
#观看详情
|
||||||
elif a=='detail':
|
elif a=='watch_detail':
|
||||||
id=req.GET.get('eduid')
|
id=req.GET.get('eduid')
|
||||||
userid = req.session['userid']
|
userid = req.session['userid']
|
||||||
companyid = getcompany(userid)#公司ID
|
companyid = getcompany(userid)#公司ID
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
var html;
|
var html;
|
||||||
|
|
||||||
$('#eduwatchtable').datagrid({
|
$('#eduwatchtable').datagrid({
|
||||||
url: 'edu/api?a=detail&eduid=' + eduid,
|
url: 'edu/api?a=watch_detail&eduid=' + eduid,
|
||||||
rownumbers: true,
|
rownumbers: true,
|
||||||
singleSelect: true,
|
singleSelect: true,
|
||||||
striped: true,
|
striped: true,
|
||||||
|
|
|
@ -189,6 +189,7 @@ urlpatterns = [
|
||||||
path('api/rights',views.apirights),
|
path('api/rights',views.apirights),
|
||||||
path('api/socert',views.apisocert),
|
path('api/socert',views.apisocert),
|
||||||
path('api/user',views.apiuser),
|
path('api/user',views.apiuser),
|
||||||
|
path('api/get_user_from_username', views.get_user_from_username),
|
||||||
path('api/partuser',views.apipartuser),
|
path('api/partuser',views.apipartuser),
|
||||||
path('api/duibiao',views.apiduibiao),
|
path('api/duibiao',views.apiduibiao),
|
||||||
path('api/suggest',views.apisuggest),
|
path('api/suggest',views.apisuggest),
|
||||||
|
|
|
@ -4701,6 +4701,15 @@ def apipartuser(req):
|
||||||
'checked': False, 'isPeople': True, 'children': []})
|
'checked': False, 'isPeople': True, 'children': []})
|
||||||
return JsonResponse({"code": 1, "data": lst})
|
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
|
@apicheck_login
|
||||||
def apiuser(req):
|
def apiuser(req):
|
||||||
a = req.GET.get('a')
|
a = req.GET.get('a')
|
||||||
|
|
Loading…
Reference in New Issue