diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py
index c41108a8ce131cab3874461d8e8a75872631603a..c8ec728af5ebb412461ba2d6707c2c8406b89f80 100644
--- a/lms/djangoapps/courseware/views/views.py
+++ b/lms/djangoapps/courseware/views/views.py
@@ -551,7 +551,7 @@ class CourseTabView(EdxFragmentView):
else:
if not CourseEnrollment.is_enrolled(request.user, course.id) and not allow_anonymous:
# Only show enroll button if course is open for enrollment.
- if course_open_for_self_enrollment(course.id):
+ if course_open_for_self_enrollment(course.id) and not course.invitation_only:
enroll_message = _(u'You must be enrolled in the course to see course content. \
{enroll_link_start}Enroll now{enroll_link_end}.')
PageLevelMessages.register_warning_message(
diff --git a/openedx/features/course_experience/tests/views/test_course_home.py b/openedx/features/course_experience/tests/views/test_course_home.py
index 3615f32c044b394fd5ecfa6b02c413d572641f49..41ea43f3f5e513817250113d434441acb3389a9e 100644
--- a/openedx/features/course_experience/tests/views/test_course_home.py
+++ b/openedx/features/course_experience/tests/views/test_course_home.py
@@ -125,6 +125,14 @@ class CourseHomePageTestCase(SharedModuleStoreTestCase):
number='test',
display_name='Test Course',
start=now() - timedelta(days=30),
+ metadata={"invitation_only": False}
+ )
+ cls.private_course = CourseFactory.create(
+ org='edX',
+ number='test',
+ display_name='Test Private Course',
+ start=now() - timedelta(days=30),
+ metadata={"invitation_only": True}
)
with cls.store.bulk_operations(cls.course.id):
chapter = ItemFactory.create(
@@ -292,6 +300,9 @@ class TestCourseHomePageAccess(CourseHomePageTestCase):
url = course_home_url(self.course)
response = self.client.get(url)
+ private_url = course_home_url(self.private_course)
+ private_response = self.client.get(private_url)
+
# Verify that the course tools and dates are always shown
self.assertContains(response, TEST_COURSE_TOOLS)
self.assertContains(response, TEST_COURSE_TODAY)
@@ -312,7 +323,7 @@ class TestCourseHomePageAccess(CourseHomePageTestCase):
# Verify the outline is shown to enrolled users, unenrolled_staff and anonymous users if allowed
self.assertContains(response, TEST_CHAPTER_NAME, count=(1 if expected_course_outline else 0))
- # Verify that the expected message is shown to the user
+ # Verify the message shown to the user
if not enable_unenrolled_access or course_visibility != COURSE_VISIBILITY_PUBLIC:
self.assertContains(
response, 'To see course content', count=(1 if is_anonymous else 0)
@@ -321,6 +332,12 @@ class TestCourseHomePageAccess(CourseHomePageTestCase):
if expected_enroll_message:
self.assertContains(response, 'You must be enrolled in the course to see course content.')
+ if enable_unenrolled_access and course_visibility == COURSE_VISIBILITY_PUBLIC:
+ if user_type == CourseUserType.UNENROLLED and self.private_course.invitation_only:
+ if expected_enroll_message:
+ self.assertContains(private_response,
+ 'You must be enrolled in the course to see course content.')
+
@override_waffle_flag(UNIFIED_COURSE_TAB_FLAG, active=False)
@override_waffle_flag(SHOW_REVIEWS_TOOL_FLAG, active=True)
@ddt.data(
diff --git a/openedx/features/course_experience/views/course_home_messages.py b/openedx/features/course_experience/views/course_home_messages.py
index edd11f322c4d0ce0e36dcbe6320801aff6023a8f..084f2f296e9deaff853d528be61af815b7a04101 100644
--- a/openedx/features/course_experience/views/course_home_messages.py
+++ b/openedx/features/course_experience/views/course_home_messages.py
@@ -5,16 +5,12 @@ View logic for handling course messages.
from datetime import datetime
from babel.dates import format_date, format_timedelta
+from courseware.courses import get_course_date_blocks, get_course_with_access
from django.contrib import auth
from django.template.loader import render_to_string
from django.utils.http import urlquote_plus
-from django.utils.translation import ugettext as _
from django.utils.translation import get_language, to_locale
-from opaque_keys.edx.keys import CourseKey
-from pytz import UTC
-from web_fragments.fragment import Fragment
-
-from courseware.courses import get_course_date_blocks, get_course_with_access
+from django.utils.translation import ugettext as _
from lms.djangoapps.course_goals.api import (
get_course_goal,
get_course_goal_options,
@@ -23,10 +19,15 @@ from lms.djangoapps.course_goals.api import (
valid_course_goals_ordered
)
from lms.djangoapps.course_goals.models import GOAL_KEY_CHOICES
+from lms.djangoapps.courseware.courses import allow_public_access
+from opaque_keys.edx.keys import CourseKey
from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
from openedx.core.djangolib.markup import HTML, Text
from openedx.features.course_experience import CourseHomeMessages
+from pytz import UTC
from student.models import CourseEnrollment
+from web_fragments.fragment import Fragment
+from xmodule.course_module import COURSE_VISIBILITY_PUBLIC
class CourseHomeMessageFragmentView(EdxFragmentView):
@@ -107,7 +108,9 @@ def _register_course_home_messages(request, course, user_access, course_start_da
"""
Register messages to be shown in the course home content page.
"""
- if user_access['is_anonymous']:
+ allow_anonymous = allow_public_access(course, [COURSE_VISIBILITY_PUBLIC])
+
+ if user_access['is_anonymous'] and not allow_anonymous:
CourseHomeMessages.register_info_message(
request,
Text(_(
@@ -124,19 +127,26 @@ def _register_course_home_messages(request, course, user_access, course_start_da
),
title=Text(_('You must be enrolled in the course to see course content.'))
)
- if not user_access['is_anonymous'] and not user_access['is_staff'] and not user_access['is_enrolled']:
- CourseHomeMessages.register_info_message(
- request,
- Text(_(
- u'{open_enroll_link}Enroll now{close_enroll_link} to access the full course.'
- )).format(
- open_enroll_link=HTML('<button class="enroll-btn btn-link">'),
- close_enroll_link=HTML('</button>')
- ),
- title=Text(_(u'Welcome to {course_display_name}')).format(
- course_display_name=course.display_name
+ if not user_access['is_anonymous'] and not user_access['is_staff'] and \
+ not user_access['is_enrolled']:
+ if not course.invitation_only:
+ CourseHomeMessages.register_info_message(
+ request,
+ Text(_(
+ u'{open_enroll_link}Enroll now{close_enroll_link} to access the full course.'
+ )).format(
+ open_enroll_link=HTML('<button class="enroll-btn btn-link">'),
+ close_enroll_link=HTML('</button>')
+ ),
+ title=Text(_(u'Welcome to {course_display_name}')).format(
+ course_display_name=course.display_name
+ )
+ )
+ else:
+ CourseHomeMessages.register_info_message(
+ request,
+ Text(_('You must be enrolled in the course to see course content.')),
)
- )
def _register_course_goal_message(request, course):