Skip to content

Commit

Permalink
update DuelSerialzier
Browse files Browse the repository at this point in the history
  • Loading branch information
myslak71 authored and myslak71 committed Feb 7, 2019
1 parent 91cfb55 commit aece5e1
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 175 deletions.
12 changes: 3 additions & 9 deletions duels/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,18 @@ class UserSerializer(serializers.ModelSerializer):
class Meta:
model = User
fields = ('id', 'username', 'date_joined')
read_only_fields = ('id', 'date_joined')


class DuelSerializer(serializers.ModelSerializer):
user1 = UserSerializer(read_only=True)
user2 = UserSerializer(read_only=True)
# user2 = serializers.HyperlinkedRelatedField(read_only=True, view_name='siemku')

class Meta:
model = Duel
fields = ('__all__')
read_only_fields = ('rounds',)

# def to_representation(self, instance):
# ret = super().to_representation(instance)
# if self.context.get('pass_username'):
# ret['user1'] = {'id': ret['user1'], 'username': User.objects.get(pk=ret['user1']).username}
# ret['user2'] = {'id': ret['user2'], 'username': User.objects.get(pk=ret['user2']).username}
# return ret


class DatasetSerializer(serializers.ModelSerializer):
class Meta:
Expand All @@ -55,8 +49,8 @@ def to_representation(self, instance):
ret['name_display'] = choice
return ret


class DefaultAlgorithmSerializer(serializers.ModelSerializer):
class Meta:
model = DefaultAlgorithm
fields = ('__all__')

5 changes: 3 additions & 2 deletions duels/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,16 @@ class DuelCreateView(CreateAPIView):
permission_classes = (permissions.IsAuthenticated,)

def perform_create(self, serializer):
serializer.save(user2=self.request.user, user1_percentage=[], user2_percentage=[])
user1_id = self.request.data.get('user1')
user1 = User.objects.get(pk=user1_id)
serializer.save(user1=user1, user2=self.request.user, user1_percentage=[], user2_percentage=[])


class DuelUpdateView(UpdateAPIView):
permission_classes = (permissions.IsAuthenticated,)
queryset = Duel.objects.all()
serializer_class = DuelSerializer


def perform_update(self, serializer):
duel = serializer.save()
algorithm = Algorithm.objects.get(pk=self.request.data['algorithm'])
Expand Down
2 changes: 1 addition & 1 deletion src/components/AddDuelForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class AddDuelForm extends React.Component {
const postObj = {
user1: this.state.user1,
dataset: this.state.dataset,
rounds: []
rounds: [],
};
axios.defaults.xsrfHeaderName = "X-CSRFTOKEN";
axios.defaults.xsrfCookieName = "csrftoken";
Expand Down
56 changes: 0 additions & 56 deletions src/components/Article.js

This file was deleted.

66 changes: 0 additions & 66 deletions src/containers/ArticleDetailView.js

This file was deleted.

41 changes: 0 additions & 41 deletions src/containers/ArticleListView.js

This file was deleted.

0 comments on commit aece5e1

Please sign in to comment.