carom/carom-server
6
1
Fork 0
Code Issues Pull Requests Releases 2 Activity

Merge branch 'feature/#3_accounting_dialog' of git.einsle.de:carom/carom-server into feature/#3_accounting_dialog

Browse Source
This commit is contained in:
Alexander Werner 2017-03-06 19:03:39 +01:00
commit 1a7cce0934
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
billard/serializers.py
View File

@ -1,4 +1,4 @@
from billard.models import *
from billard.models import LocationData
from rest_framework import serializers

4
billard/views.py
View File

@ -1,5 +1,5 @@
from billard.serializers import *
from .models import LocationData, process_location_data
from billard.serializers import LocationDataSerializer
from .models import LocationData, Location, Client, Accounting, process_location_data
from rest_framework import viewsets
from django.shortcuts import render, redirect
from django.views import generic