From 7d90617c5e9fb898609334c9c67d3a2dea062792 Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Wed, 15 Aug 2012 12:21:59 -0400 Subject: [PATCH] Merge with master --- lms/djangoapps/courseware/courses.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/lms/djangoapps/courseware/courses.py b/lms/djangoapps/courseware/courses.py index 3eaff318a5..e142614f46 100644 --- a/lms/djangoapps/courseware/courses.py +++ b/lms/djangoapps/courseware/courses.py @@ -142,9 +142,6 @@ def get_course_info_section(course, section_key): raise KeyError("Invalid about key " + str(section_key)) -<<<<<<< HEAD -def get_courses_by_university(user): -======= def course_staff_group_name(course): ''' course should be either a CourseDescriptor instance, or a string (the @@ -200,7 +197,6 @@ def has_access_to_course(user, course): def get_courses_by_university(user, domain=None): ->>>>>>> implement subdomain-based course displays ''' Returns dict of lists of courses available, keyed by course.org (ie university). Courses are sorted by course.number. @@ -221,16 +217,10 @@ def get_courses_by_university(user, domain=None): universities = defaultdict(list) for course in courses: -<<<<<<< HEAD - if has_access(user, course, 'see_exists'): - universities[course.org].append(course) -======= - if settings.MITX_FEATURES.get('ACCESS_REQUIRE_STAFF_FOR_COURSE'): - if not has_access_to_course(user,course): - continue + if not has_access(user, course, 'see_exists'): + continue if course.id not in visible_courses: continue universities[course.org].append(course) ->>>>>>> implement subdomain-based course displays return universities