fixes 206, 240

event/admin.py

@@ -17,6 +17,13 @@ def get_queryset(self, request):
         org = Organisation.objects.filter(owner=request.user)
         return Event.objects.filter(organisation__in=org)
 
+    # Overriding event form to not allow user to create organisation at the time of creating event
+    def get_form(self, request, obj=None, **kwargs):
+        form = super(EventAdmin, self).get_form(request, obj, **kwargs)
+        widget = form.base_fields['organisation'].widget
+        widget.can_add_related = False
+        return form
+
     # pylint: disable=W0222
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         # when we are creating or editing new event and the logged in user is not superuser

organisation/views.py

@@ -2,6 +2,7 @@
 from rest_framework import viewsets, status
 from .models import Organisation
 from event.models import Event
+from event.serializers import EventSerializer
 from .serializer import OrganisationSerializer, OrganisationCreateSerializer
 # Create your views here.
 from rest_framework.response import Response
@@ -23,9 +24,10 @@ def retrieve(self,request,pk=None):
             queryset_organisation = Organisation.objects.get(pk=pk)
         except Organisation.DoesNotExist:
             raise Http404
-        queryset_event = Event.objects.filter(organisation=pk).values()
+        queryset_event = Event.objects.filter(organisation=pk)
+        serialized_data_events = EventSerializer(queryset_event, many=True)
         serialized_data_organisation = OrganisationSerializer(queryset_organisation)
-        data = { **serialized_data_organisation.data }
-        data['events'] = queryset_event
+        data = { **serialized_data_organisation.data}
+        data['events'] = serialized_data_events.data
 
         return Response(data, status=status.HTTP_200_OK)