Skip to content

Commit 8805afc

Browse files
committed
fixup! fix: adjust studio_grading_url to use the correct URL
1 parent 16f8063 commit 8805afc

3 files changed

Lines changed: 4 additions & 7 deletions

File tree

lms/djangoapps/instructor/tests/test_api_v2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ def test_get_course_metadata_as_instructor(self):
166166

167167
# Verify other metadata fields
168168
assert 'num_sections' in data
169-
assert 'tabs' in data
170169
assert 'grade_cutoffs' in data
171170
assert 'course_errors' in data
172171
assert 'studio_url' in data
@@ -180,6 +179,7 @@ def test_get_course_metadata_as_instructor(self):
180179
assert data['studio_grading_url'] == f'http://localhost:2001/authoring/course/{self.course.id}/settings/grading'
181180
assert data['admin_console_url'] == 'http://localhost:2025/admin-console/authz'
182181

182+
@override_settings(ADMIN_CONSOLE_MICROFRONTEND_URL='http://localhost:2025/admin-console')
183183
def test_admin_console_url_requires_instructor_access(self):
184184
"""
185185
Test that the admin console URL is only available to users with instructor access.

lms/djangoapps/instructor/views/api_v2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def get(self, request, course_id):
206206
"grade_cutoffs": "A is 0.9, B is 0.8, C is 0.7, D is 0.6",
207207
"course_errors": [],
208208
"studio_url": "https://studio.example.com/course/course-v1:edX+DemoX+2024",
209-
"admin_console_url": "http://apps.local.openedx.io:2025/admin-console/authz",
209+
"admin_console_url": "http://apps.local.openedx.io:2025/admin-console/authz", # May be null if user does not have access
210210
"permissions": {
211211
"admin": false,
212212
"instructor": true,

lms/djangoapps/instructor/views/serializers_v2.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,7 @@ def get_gradebook_url(self, data):
458458
def get_studio_grading_url(self, data):
459459
"""Get Studio MFE grading settings URL for the course."""
460460
course_key = data['course'].id
461-
mfe_base_url = configuration_helpers.get_value_for_org(
462-
course_key.org,
461+
mfe_base_url = configuration_helpers.get_value(
463462
'MFE_CONFIG',
464463
getattr(settings, 'MFE_CONFIG', None)
465464
)
@@ -470,11 +469,9 @@ def get_studio_grading_url(self, data):
470469

471470
def get_admin_console_url(self, data):
472471
"""Get admin console URL (requires instructor access and MFE configuration, null if not accessible)."""
473-
course_key = data['course'].id
474472
request = data['request']
475473
has_instructor_access = has_access(request.user, 'instructor', data['course'])
476-
mfe_base_url = configuration_helpers.get_value_for_org(
477-
course_key.org,
474+
mfe_base_url = configuration_helpers.get_value(
478475
'ADMIN_CONSOLE_MICROFRONTEND_URL',
479476
getattr(settings, 'ADMIN_CONSOLE_MICROFRONTEND_URL', None)
480477
)

0 commit comments

Comments
 (0)