:art: Update get_course_list
huangqimin001
1 changed files with 8 additions and 6 deletions
+ 8
- 6
api/course_views.py
@@ -78,15 +78,17 @@ def get_course_list(request): |
||
| 78 | 78 |
try: |
| 79 | 79 |
admin = BranchCampusAdministratorInfo.objects.get(admin_id=admin_id, user_status=BranchCampusAdministratorInfo.ACTIVATED) |
| 80 | 80 |
except BranchCampusAdministratorInfo.DoesNotExist: |
| 81 |
- return response() |
|
| 81 |
+ admin = None |
|
| 82 | 82 |
|
| 83 |
- course = CourseInfo.objects.filter(authorities__contains=admin.campus_id, status=True) |
|
| 84 |
- count = course.count() |
|
| 85 |
- course, left = pagination(course, page, num) |
|
| 86 |
- course = [c.admindata(admin_id) for c in course] |
|
| 83 |
+ courses = CourseInfo.objects.filter(status=True) |
|
| 84 |
+ if admin: |
|
| 85 |
+ courses = courses.filter(authorities__contains=admin.campus_id) |
|
| 86 |
+ count = courses.count() |
|
| 87 |
+ courses, left = pagination(courses, page, num) |
|
| 88 |
+ courses = [course.admindata(admin_id) for course in courses] |
|
| 87 | 89 |
|
| 88 | 90 |
return response(data={
|
| 89 |
- 'logs': course, |
|
| 91 |
+ 'logs': courses, |
|
| 90 | 92 |
'count': count, |
| 91 | 93 |
'left': left, |
| 92 | 94 |
}) |