# HG changeset patch # User rougeronj # Date 1434029700 -7200 # Node ID 389540e1073f6b70d3cc0b08170e14cb7833a82d # Parent eb84ca2b6317d7e9a1d8df21bb3f47ba4f59d4f5 add filter 'type' to return books of type 'visit' or 'book' clean unused import diff -r eb84ca2b6317 -r 389540e1073f server/ammicosrv/ammico/views.py --- a/server/ammicosrv/ammico/views.py Thu Jun 11 12:35:10 2015 +0200 +++ b/server/ammicosrv/ammico/views.py Thu Jun 11 15:35:00 2015 +0200 @@ -5,7 +5,7 @@ from django.conf import settings from django.contrib.auth import get_user_model -from django.core.urlresolvers import reverse, reverse_lazy +from django.core.urlresolvers import reverse from django.http import HttpResponse from django.shortcuts import render from django.utils.dateparse import parse_datetime @@ -135,6 +135,9 @@ books = Book.objects.filter(user = request.user.id) if 'idExpo' in request.GET: books = books.filter(exposition = request.GET['idExpo']) + if 'type' in request.GET: + books = books.filter(id_article__isnull = True if (request.GET['type'] == 'book') else False) + serializer = BookSerializer(books, many=True) return Response(serializer.data) diff -r eb84ca2b6317 -r 389540e1073f server/ammicosrv/authentication/views.py --- a/server/ammicosrv/authentication/views.py Thu Jun 11 12:35:10 2015 +0200 +++ b/server/ammicosrv/authentication/views.py Thu Jun 11 15:35:00 2015 +0200 @@ -4,14 +4,14 @@ from django.conf import settings from django.contrib.auth import get_user_model import requests -from rest_framework import serializers, status, permissions, parsers, renderers +from rest_framework import status, permissions, parsers, renderers from rest_framework.authtoken.models import Token from rest_framework.response import Response from rest_framework.views import APIView from ammicosrv.ammico.views import populateVisit -from ammicosrv.authentication.serializers import AuthTokenSerializer, \ - UserSerializer +from ammicosrv.authentication.serializers import UserSerializer, \ + AuthTokenSerializer #from ammico.views import populateVisit