Merge pull request #407 from edly-io/farhan/EDLY-5860

Badgr Flow on Panel FE EDLY-5860
edly-io · Aug 17, 2023 · 1a4eda7 · 1a4eda7
2 parents ba357fa + aefd959
commit 1a4eda7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/cms/envs/common.py b/cms/envs/common.py
@@ -780,7 +780,7 @@
     'DEFAULT_FROM_EMAIL', 'BULK_EMAIL_DEFAULT_FROM_EMAIL',
     'FEATURES', 'MKTG_URLS', 'MARKETING_SITE_ROOT',
     'CORS_ORIGIN_WHITELIST', 'CURRENT_PLAN', 'LMS_SEGMENT_KEY', 'CMS_SEGMENT_KEY', 'BADGR_USERNAME', 'BADGR_PASSWORD',
-    'BADGR_ISSUER_SLUG',
+    'BADGR_ISSUER_SLUG', 'ENABLE_OPENBADGES',
 ]
 
 # CORS CONFIG

diff --git a/lms/djangoapps/badges/api/serializers.py b/lms/djangoapps/badges/api/serializers.py
@@ -16,7 +16,8 @@ class BadgeClassSerializer(serializers.ModelSerializer):
 
     class Meta(object):
         model = BadgeClass
-        fields = ('slug', 'issuing_component', 'display_name', 'course_id', 'description', 'criteria', 'image_url')
+        fields = ('slug', 'issuing_component', 'display_name', 'course_id', 'description', 'criteria', 'image_url',
+                  'mode', 'badgr_server_slug')
 
 
 class BadgeAssertionSerializer(serializers.ModelSerializer):

diff --git a/lms/djangoapps/badges/events/course_complete.py b/lms/djangoapps/badges/events/course_complete.py
@@ -103,7 +103,8 @@ def get_completion_badge(course_id, user):
         course_id=course_id,
         mode=mode,
         display_name=course.display_name,
-        image_file_handle=CourseCompleteImageConfiguration.image_for_mode(mode)
+        image_file_handle=CourseCompleteImageConfiguration.image_for_mode(mode),
+        create=False
     )
 
 

diff --git a/lms/djangoapps/certificates/views/webview.py b/lms/djangoapps/certificates/views/webview.py
@@ -420,7 +420,12 @@ def _update_badge_context(context, course, user):
     """
     badge = None
     if badges_enabled() and course.issue_badges:
-        badges = get_completion_badge(course.location.course_key, user).get_for_user(user)
+        completion_badge = get_completion_badge(course.location.course_key, user)
+        if completion_badge is not None:
+            badges = completion_badge.get_for_user(user)
+        else:
+            badges = None
+
         if badges:
             badge = badges[0]
     context['badge'] = badge

diff --git a/lms/envs/common.py b/lms/envs/common.py
@@ -1687,7 +1687,7 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
     'REGISTRATION_EXTRA_FIELDS',
     'CSRF_TRUSTED_ORIGINS', 'CORS_ORIGIN_WHITELIST', 'CURRENT_PLAN',
     'LMS_SEGMENT_KEY', 'CMS_SEGMENT_KEY', 'BADGR_USERNAME', 'BADGR_PASSWORD',
-    'BADGR_ISSUER_SLUG',
+    'BADGR_ISSUER_SLUG', 'ENABLE_OPENBADGES',
 ]
 
 ENABLE_SUBSCRIPTIONS_ON_RUNTIME_SWITCH = 'enable_subscriptions'