Skip to content

Commit

Permalink
Merge pull request #153 from edubadges/feature/extra_eppn_directaward
Browse files Browse the repository at this point in the history
  • Loading branch information
Iso5786 authored Oct 31, 2024
2 parents eaeb618 + 7e79305 commit f712be5
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions apps/directaward/api.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import datetime
import threading
from rest_framework.views import APIView

from drf_spectacular.utils import extend_schema, inline_serializer
from rest_framework import serializers
from rest_framework import status
from rest_framework.response import Response
from drf_spectacular.utils import extend_schema, inline_serializer
from rest_framework.views import APIView

from directaward.models import DirectAward, DirectAwardBundle
from directaward.permissions import IsDirectAwardOwner
from directaward.serializer import DirectAwardSerializer, DirectAwardBundleSerializer
from directaward.signals import audit_trail_signal, direct_award_audit_trail
from directaward.signals import audit_trail_signal
from entity.api import BaseEntityListView, BaseEntityDetailView, VersionedObjectMixin
from mainsite import settings
from mainsite.exceptions import (
Expand All @@ -17,8 +21,6 @@
from mainsite.permissions import AuthenticatedWithVerifiedEmail
from mainsite.utils import EmailMessageMaker, send_mail
from staff.permissions import HasObjectPermission
from rest_framework import serializers
import datetime


class DirectAwardBundleList(VersionedObjectMixin, BaseEntityListView):
Expand Down Expand Up @@ -50,6 +52,7 @@ def convert_badge_assertion(badge_instance):
"public": badge_instance.public,
"revoked": badge_instance.revoked,
"entity_id": badge_instance.entity_id,
"eppn": badge_instance.user.eppns[0]
}

results = {
Expand Down

0 comments on commit f712be5

Please sign in to comment.