Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion teleband/users/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ class Meta:
class UserInstrumentConfigSerializer(serializers.ModelSerializer):
class Meta:
model = InstrumentConfig
fields = ["id", "name", "description", "settings"]
fields = ["id", "name", "description", "settings", "file"]
8 changes: 6 additions & 2 deletions teleband/users/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
)
from teleband.courses.models import Enrollment, Course
from teleband.users.models import InstrumentConfig

from django.db.models import Q
User = get_user_model()
Invitation = get_invitation_model()

Expand Down Expand Up @@ -153,8 +153,12 @@ class UserInstrumentConfigViewSet(ModelViewSet):
serializer_class = UserInstrumentConfigSerializer
queryset = InstrumentConfig.objects.all()


def get_queryset(self):
return self.request.user.instrumentconfig_set.all()
return InstrumentConfig.objects.filter(Q(user=self.request.user) | Q(user=None))

def perform_create(self, serializer):
serializer.save(user=self.request.user)


obtain_delete_auth_token = ObtainDeleteAuthToken.as_view()
Loading