Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: don't show broken enroll link for staff on invite courses

Browse Source 
Non-enrolled staff users were being shown enroll links for courses
that you can't self-enroll for (masters-only, invitation-only, etc).

This fixes the outline page to ignore staff status for that check.

AA-1164
This commit is contained in:
Michael Terry
2022-01-24 15:51:42 -05:00
parent 3eea5d9337
commit 44e799f60d
6 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/djangoapps/course_home_api/outline/views.py
View File

@@ -2,7 +2,6 @@
Outline Tab Views
"""
from datetime import datetime, timezone
from lms.djangoapps.grades.course_grade_factory import CourseGradeFactory
from completion.exceptions import UnavailableCompletionData # lint-amnesty, pylint: disable=wrong-import-order
from completion.utilities import get_key_to_last_completed_block # lint-amnesty, pylint: disable=wrong-import-order
@@ -38,7 +37,9 @@ from lms.djangoapps.courseware.context_processor import user_timezone_locale_pre
from lms.djangoapps.courseware.courses import get_course_date_blocks, get_course_info_section, get_course_with_access
from lms.djangoapps.courseware.date_summary import TodaysDate
from lms.djangoapps.courseware.masquerade import is_masquerading, setup_masquerade
from lms.djangoapps.courseware.toggles import course_is_invitation_only
from lms.djangoapps.courseware.views.views import get_cert_data
from lms.djangoapps.grades.course_grade_factory import CourseGradeFactory
from openedx.core.djangoapps.content.learning_sequences.api import (
get_user_course_outline,
public_api_available as learning_sequences_api_available,
@@ -275,14 +276,14 @@ class OutlineTabView(RetrieveAPIView):
if allow_public or user_is_masquerading:
handouts_html = get_course_info_section(request, request.user, course, 'handouts')
if not show_enrolled:
if not is_enrolled:
if CourseMode.is_masters_only(course_key):
enroll_alert['can_enroll'] = False
enroll_alert['extra_text'] = _(
'Please contact your degree administrator or '
'{platform_name} Support if you have questions.'
).format(platform_name=settings.PLATFORM_NAME)
elif course.invitation_only:
elif course_is_invitation_only(course):
enroll_alert['can_enroll'] = False
# Sometimes there are sequences returned by Course Blocks that we

6
lms/djangoapps/courseware/access.py
View File

@@ -42,7 +42,7 @@ from lms.djangoapps.courseware.masquerade import get_masquerade_role, is_masquer
from lms.djangoapps.ccx.custom_exception import CCXLocatorValidationException
from lms.djangoapps.ccx.models import CustomCourseForEdX
from lms.djangoapps.mobile_api.models import IgnoreMobileAvailableFlagConfig
from lms.djangoapps.courseware.toggles import is_courses_default_invite_only_enabled
from lms.djangoapps.courseware.toggles import course_is_invitation_only
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
from openedx.features.course_duration_limits.access import check_course_expired
from common.djangoapps.student import auth
@@ -272,8 +272,8 @@ def _can_enroll_courselike(user, courselike):
if _has_staff_access_to_descriptor(user, courselike, course_key):
return ACCESS_GRANTED
# Access denied when default value of COURSES_INVITE_ONLY set to True
if is_courses_default_invite_only_enabled() or courselike.invitation_only:
# Access denied when the course requires an invitation
if course_is_invitation_only(courselike):
debug("Deny: invitation only")
return ACCESS_DENIED

29
lms/djangoapps/courseware/toggles.py
View File

@@ -114,6 +114,19 @@ COURSEWARE_OPTIMIZED_RENDER_XBLOCK = CourseWaffleFlag(
WAFFLE_FLAG_NAMESPACE, 'optimized_render_xblock', __name__
)
# .. toggle_name: COURSES_INVITE_ONLY
# .. toggle_implementation: SettingToggle
# .. toggle_type: feature_flag
# .. toggle_default: False
# .. toggle_description: Setting this sets the default value of INVITE_ONLY across all courses in a given deployment
# .. toggle_category: admin
# .. toggle_use_cases: open_edx
# .. toggle_creation_date: 2019-05-16
# .. toggle_expiration_date: None
# .. toggle_tickets: https://github.com/mitodl/edx-platform/issues/123
# .. toggle_status: unsupported
COURSES_INVITE_ONLY = SettingToggle('COURSES_INVITE_ONLY', default=False)
def courseware_mfe_is_active(course_key: CourseKey) -> bool:
"""
@@ -238,16 +251,6 @@ def streak_celebration_is_active(course_key):
)
# .. toggle_name: COURSES_INVITE_ONLY
# .. toggle_implementation: SettingToggle
# .. toggle_type: feature_flag
# .. toggle_default: False
# .. toggle_description: Setting this sets the default value of INVITE_ONLY across all courses in a given deployment
# .. toggle_category: admin
# .. toggle_use_cases: open_edx
# .. toggle_creation_date: 2019-05-16
# .. toggle_expiration_date: None
# .. toggle_tickets: https://github.com/mitodl/edx-platform/issues/123
# .. toggle_status: unsupported
def is_courses_default_invite_only_enabled():
return SettingToggle("COURSES_INVITE_ONLY", default=False).is_enabled()
def course_is_invitation_only(courselike) -> bool:
"""Returns whether the course is invitation only or not."""
return COURSES_INVITE_ONLY.is_enabled() or courselike.invitation_only

6
lms/djangoapps/courseware/views/views.py
View File

@@ -97,7 +97,7 @@ from lms.djangoapps.courseware.permissions import (
VIEW_COURSE_HOME,
VIEW_COURSEWARE,
)
from lms.djangoapps.courseware.toggles import is_courses_default_invite_only_enabled
from lms.djangoapps.courseware.toggles import course_is_invitation_only
from lms.djangoapps.courseware.user_state_client import DjangoXBlockUserStateClient
from lms.djangoapps.edxnotes.helpers import is_feature_enabled
from lms.djangoapps.experiments.utils import get_experiment_user_metadata_context
@@ -733,7 +733,7 @@ class CourseTabView(EdxFragmentView):
@staticmethod
def course_open_for_learner_enrollment(course):
return (course_open_for_self_enrollment(course.id)
and not course.invitation_only
and not course_is_invitation_only(course)
and not CourseMode.is_masters_only(course.id))
@staticmethod
@@ -976,7 +976,7 @@ def course_about(request, course_id):
# Used to provide context to message to student if enrollment not allowed
can_enroll = bool(request.user.has_perm(ENROLL_IN_COURSE, course))
invitation_only = is_courses_default_invite_only_enabled() or course.invitation_only
invitation_only = course_is_invitation_only(course)
is_course_full = CourseEnrollment.objects.is_course_full(course)
# Register button should be disabled if one of the following is true: