diff --git a/safesite/templates/train.html b/safesite/templates/train.html index 2f7322bf..e48c7c55 100644 --- a/safesite/templates/train.html +++ b/safesite/templates/train.html @@ -222,7 +222,7 @@ var row = $('#pxtable').datagrid('getSelected'); if (row) { if (row.state == 0) { - if ($("#userindex").attr('userid') == row.submituser__userid) { + if ($("#userindex").attr('userid') == row.submituser__userid || $("#userindex").attr('userid') == row.lecturer__userid) { url = 'abtrain?trainid=' + row.trainid + '&a=accesstrain' opendg('评估培训', url) } else { $.messager.alert('提示', '非填报人不能评估!'); } diff --git a/safesite/views.py b/safesite/views.py index 4409f26f..e388aaed 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -3085,7 +3085,7 @@ def pxhandle(req): total = a.count() startnum, endnum = fenye(req) obj = a.order_by('-starttime')[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', - 'trainname', 'traintype__dickeyname', 'teacher', 'lecturer__name', 'submituser__name', 'submituser__userid') + 'trainname', 'traintype__dickeyname', 'teacher', 'lecturer__name', 'submituser__name', 'submituser__userid', 'lecturer__userid') return HttpResponse(transjson(total, obj), content_type="application/json") elif req.GET.get('a') == 'detailhtml': trainid = req.GET.get('trainid') @@ -3098,7 +3098,7 @@ def pxhandle(req): total = a.count() startnum, endnum = fenye(req) a = a[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname', - 'traintype__dickeyname', 'teacher', 'lecturer__name', 'submituser__name', 'submituser__userid') + 'traintype__dickeyname', 'teacher', 'lecturer__name', 'submituser__name', 'submituser__userid', 'lecturer__userid') return HttpResponse(transjson(total, a), content_type="application/json") elif req.GET.get('a') == 'listtodo': userid = req.session['userid']