inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-17 04:25:42 +00:00
Code Activity

Tweaking URL patterns

Browse Source
This commit is contained in:
Oliver Walters
2017-04-14 21:44:01 +10:00
parent 146ad5e9ae
commit 858a7fe089
7 changed files with 52 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
InvenTree/stock/serializers.py
View File

@ -20,18 +20,7 @@ class StockItemSerializer(serializers.ModelSerializer):
'expected_arrival')
class LocationBriefSerializer(serializers.ModelSerializer):
""" Brief information about a stock location
"""
class Meta:
model = StockLocation
fields = ('pk',
'name',
'description')
class LocationDetailSerializer(serializers.ModelSerializer):
class LocationSerializer(serializers.ModelSerializer):
""" Detailed information about a stock location
"""

13
InvenTree/stock/urls.py
View File

@ -3,18 +3,21 @@ from django.conf.urls import url, include
from . import views
locpatterns = [
url(r'^(?P<pk>[0-9]+)/?$', views.LocationDetail.as_view()),
url(r'^(?P<pk>[0-9]+)/?$', views.LocationDetail.as_view(), name='location-detail'),
url(r'^\?*[^/]*/?$', views.LocationList.as_view())
url(r'^\?.*/?$', views.LocationList.as_view(), name='location-list'),
url(r'^$', views.LocationList.as_view(), name='location-list')
]
urlpatterns = [
# Stock location urls
url(r'^location/?', include(locpatterns)),
url(r'^location/', include(locpatterns)),
# Detail for a single stock item
url(r'^(?P<pk>[0-9]+)$', views.StockDetail.as_view()),
url(r'^(?P<pk>[0-9]+)/?$', views.StockDetail.as_view(), name='stock-detail'),
# List all stock items, with optional filters
url(r'^\?*[^/]*/?$', views.StockList.as_view()),
url(r'^\?.*/?$', views.StockList.as_view(), name='stock-list'),
url(r'^$', views.StockList.as_view(), name='stock-list'),
]

6
InvenTree/stock/views.py
View File

@ -3,7 +3,7 @@ import django_filters
from InvenTree.models import FilterChildren
from .models import StockLocation, StockItem
from .serializers import StockItemSerializer, LocationDetailSerializer
from .serializers import StockItemSerializer, LocationSerializer
class StockDetail(generics.RetrieveUpdateDestroyAPIView):
@ -51,7 +51,7 @@ class LocationDetail(generics.RetrieveUpdateDestroyAPIView):
"""
queryset = StockLocation.objects.all()
serializer_class = LocationDetailSerializer
serializer_class = LocationSerializer
permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
@ -69,5 +69,5 @@ class LocationList(generics.ListCreateAPIView):
return locations
serializer_class = LocationDetailSerializer
serializer_class = LocationSerializer
permission_classes = (permissions.IsAuthenticatedOrReadOnly,)