Skip to content

Commit

Permalink
Closes #286 - Add my event slider
Browse files Browse the repository at this point in the history
  • Loading branch information
FedeG committed Mar 28, 2018
1 parent bc3494d commit 0fe1978
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
12 changes: 11 additions & 1 deletion eventol/eventol/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
from drf_queryfields import QueryFieldsMixin
from rest_framework import serializers, viewsets
from rest_framework_filters import FilterSet, BooleanFilter
from manager.models import Event
from rest_framework.response import Response
from manager.models import Event, EventUser


# Serializers define the API representation.
Expand Down Expand Up @@ -46,3 +47,12 @@ class EventViewSet(viewsets.ModelViewSet):
ordering_fields = ('name', 'limit_proposal_date', 'updated_at',
'attendees_count', 'last_date', 'created_at')
search_fields = ('name', 'slug', 'abstract')

def list(self, request):
me_events = request.GET.get('my_events', None)
if request.user.is_authenticated() and me_events:
events_ids = [event_user.event.pk for event_user in EventUser.objects.filter(user=request.user)]
queryset = Event.objects.filter(pk__in=events_ids)
serializer = EventSerializer(queryset, many=True, context={'request': request})
return Response({'results': serializer.data})
return super().list(request)
4 changes: 4 additions & 0 deletions eventol/front/src/containers/Home/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ export default class App extends React.Component {
<Search onChange={this.onChange} onEnter={this.onEnter} />
</Hero>
{searched && <TitleList title={gettext('Search results')} url={searchUrl} showEmpty={true} />}
<TitleList
id='my_events'
title={gettext('My Events')}
url='?my_events=true' />
<TitleList
id='recent'
title={gettext('Recent Events')}
Expand Down

0 comments on commit 0fe1978

Please sign in to comment.