From 40393b21f7fc3ac922561e0202fab93e52eece21 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Fri, 23 Aug 2013 11:41:33 -0400 Subject: [PATCH] Add in a new HTML class that represents the enrollment mode. --- common/djangoapps/student/views.py | 10 ++++------ lms/templates/dashboard.html | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 6d2b48d3db..4ee8f61358 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -1,5 +1,4 @@ import datetime -import feedparser import json import logging import random @@ -31,7 +30,6 @@ from django.views.decorators.http import require_POST from ratelimitbackend.exceptions import RateLimitException from mitxmako.shortcuts import render_to_response, render_to_string -from bs4 import BeautifulSoup from course_modes.models import CourseMode from student.models import (Registration, UserProfile, TestCenterUser, TestCenterUserForm, @@ -262,7 +260,7 @@ def dashboard(request): courses = [] for enrollment in CourseEnrollment.enrollments_for_user(user): try: - courses.append(course_from_id(enrollment.course_id)) + courses.append((course_from_id(enrollment.course_id), enrollment)) except ItemNotFoundError: log.error("User {0} enrolled in non-existent course {1}" .format(user.username, enrollment.course_id)) @@ -279,12 +277,12 @@ def dashboard(request): staff_access = True errored_courses = modulestore().get_errored_courses() - show_courseware_links_for = frozenset(course.id for course in courses + show_courseware_links_for = frozenset(course.id for course, _enrollment in courses if has_access(request.user, course, 'load')) - cert_statuses = {course.id: cert_info(request.user, course) for course in courses} + cert_statuses = {course.id: cert_info(request.user, course) for course, _enrollment in courses} - exam_registrations = {course.id: exam_registration_info(request.user, course) for course in courses} + exam_registrations = {course.id: exam_registration_info(request.user, course) for course, _enrollment in courses} # get info w.r.t ExternalAuthMap external_auth_map = None diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 5023345376..e8b676e014 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -129,9 +129,9 @@ % if len(courses) > 0: - % for course in courses: + % for course, enrollment in courses: -
+
<% course_target = reverse('info', args=[course.id]) %>