Merge branch 'master' of https://gitlab.telemabk.pl/vallher/JoinTheCity

JoinTheCityREST/app/API/views.py

@@ -29,7 +29,7 @@ class APIViewSet(viewsets.ModelViewSet):
         return Response(status=rest_framework.status.HTTP_200_OK)
 
     @detail_route()
-    def xd(self,request, pk=None):
+    def parssed(self,request, pk=None):
         api = get_object_or_404(APIViewSet.queryset, pk=pk)
         api_data = json.loads(api.data)
         return Response(status=rest_framework.status.HTTP_200_OK, data=api_data)
@@ -66,7 +66,6 @@ class APIViewSet(viewsets.ModelViewSet):
             api = queryset[0]
             api.data = response
             api.save()
-            queryset = []
         return queryset
 
 class APITypeViewSet(viewsets.ModelViewSet):

JoinTheCityREST/lib/api/baseny.py

@@ -10,7 +10,7 @@ class API(BaseAPI):
     methods = ('default', 'object')
 
     def default(self):
-        return self.GET(parameters=self.request.GET.dict())
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))
 
     def object(self):
         data = self.GET(parameters=self.request.GET.dict())
@@ -20,7 +20,7 @@ class API(BaseAPI):
                 results.append(self.unpack(obj))
         except TypeError as e:
             results.append(self.unpack(data['results']))
-        return results
+        return json.dumps(results)
 
     def unpack(self, obj):
         result = {}

JoinTheCityREST/lib/api/hotele.py

@@ -10,7 +10,7 @@ class API(BaseAPI):
     methods = ('default', 'object')
 
     def default(self):
-        return self.GET(parameters=self.request.GET.dict())
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))
 
     def object(self):
         data = self.GET(parameters=self.request.GET.dict())
@@ -20,7 +20,7 @@ class API(BaseAPI):
                 results.append(self.unpack(obj))
         except TypeError as e:
             results.append(self.unpack(data['results']))
-        return results
+        return json.dumps(results)
 
     def unpack(self, obj):
         result = {}

JoinTheCityREST/lib/api/mapaUtrudnien.py

@@ -10,7 +10,7 @@ class API(BaseAPI):
     methods = ('default', 'object')
 
     def default(self):
-        return self.GET(parameters=self.request.GET.dict())
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))
 
     def object(self):
         data = self.GET(parameters=self.request.GET.dict())
@@ -20,7 +20,7 @@ class API(BaseAPI):
                 results.append(self.unpack(obj))
         except TypeError as e:
             results.append(self.unpack(data['results']))
-        return results
+        return json.dumps(results)
 
     def unpack(self, obj):
         result = {}

JoinTheCityREST/lib/api/restauracje.py

@@ -10,7 +10,7 @@ class API(BaseAPI):
     methods = ('default', 'object')
 
     def default(self):
-        return self.GET(parameters=self.request.GET.dict())
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))
 
     def object(self):
         data = self.GET(parameters=self.request.GET.dict())
@@ -20,7 +20,7 @@ class API(BaseAPI):
                 results.append(self.unpack(obj))
         except TypeError as e:
             results.append(self.unpack(data['results']))
-        return results
+        return json.dumps(results)
 
     def unpack(self, obj):
         result = {}

JoinTheCityREST/lib/api/szpitale.py

@@ -10,7 +10,7 @@ class API(BaseAPI):
     methods = ('default', 'object')
 
     def default(self):
-        return self.GET(parameters=self.request.GET.dict())
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))
 
     def object(self):
         data = self.GET(parameters=self.request.GET.dict())
@@ -20,7 +20,7 @@ class API(BaseAPI):
                 results.append(self.unpack(obj))
         except TypeError as e:
             results.append(self.unpack(data['results']))
-        return results
+        return json.dumps(results)
 
     def unpack(self, obj):
         result = {}

JoinTheCityREST/lib/api/zdarzeniaDrogowe.py

@@ -10,4 +10,4 @@ class API(BaseAPI):
     methods = ('default')
 
     def default(self):
-        return self.GET(parameters=self.request.GET.dict())
+        return json.dumps(self.GET(parameters=self.request.GET.dict()))