From db051986a2ae5a4680b3ea0466284013ec3aa4bd Mon Sep 17 00:00:00 2001
From: Robert Einsle <robert@einsle.de>
Date: Sat, 4 Feb 2017 06:51:09 +0100
Subject: [PATCH] update location model

---
 billard/admin.py                      | 2 +-
 billard/migrations/0002_location.py   | 5 ++++-
 billard/migrations/0003_client.py     | 2 +-
 billard/migrations/0004_accounting.py | 5 ++++-
 billard/models.py                     | 2 ++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/billard/admin.py b/billard/admin.py
index c013dba..bc1b634 100644
--- a/billard/admin.py
+++ b/billard/admin.py
@@ -5,7 +5,7 @@ from .models import *
 @admin.register(Location)
 class LocationAdmin(admin.ModelAdmin):
     list_display = ('code', 'name', 'city',)
-    fields = ['code', 'name', 'street', 'plz', 'city', 'phone', 'email', 'url', ]
+    fields = ['users', 'code', 'name', 'street', 'plz', 'city', 'phone', 'email', 'url', ]
 
 
 @admin.register(Client)
diff --git a/billard/migrations/0002_location.py b/billard/migrations/0002_location.py
index e8190bf..8969661 100644
--- a/billard/migrations/0002_location.py
+++ b/billard/migrations/0002_location.py
@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.5 on 2017-02-01 12:43
+# Generated by Django 1.10.5 on 2017-02-04 05:47
 from __future__ import unicode_literals
 
+from django.conf import settings
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('billard', '0001_initial'),
     ]
 
@@ -24,6 +26,7 @@ class Migration(migrations.Migration):
                 ('phone', models.CharField(blank=True, max_length=64, null=True)),
                 ('email', models.EmailField(blank=True, max_length=254, null=True)),
                 ('url', models.URLField(blank=True, null=True)),
+                ('users', models.ManyToManyField(related_name='locations', to=settings.AUTH_USER_MODEL)),
             ],
         ),
     ]
diff --git a/billard/migrations/0003_client.py b/billard/migrations/0003_client.py
index e5f3ca0..4023293 100644
--- a/billard/migrations/0003_client.py
+++ b/billard/migrations/0003_client.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.5 on 2017-02-01 17:49
+# Generated by Django 1.10.5 on 2017-02-04 05:48
 from __future__ import unicode_literals
 
 from django.db import migrations, models
diff --git a/billard/migrations/0004_accounting.py b/billard/migrations/0004_accounting.py
index 6039b09..8a71db2 100644
--- a/billard/migrations/0004_accounting.py
+++ b/billard/migrations/0004_accounting.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.5 on 2017-02-01 19:08
+# Generated by Django 1.10.5 on 2017-02-04 05:48
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -24,5 +24,8 @@ class Migration(migrations.Migration):
                 ('client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='billard.Client')),
                 ('location', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='billard.Location')),
             ],
+            options={
+                'ordering': ['-time_from'],
+            },
         ),
     ]
diff --git a/billard/models.py b/billard/models.py
index e39fdad..20ba842 100644
--- a/billard/models.py
+++ b/billard/models.py
@@ -1,5 +1,6 @@
 import uuid
 from django.db import models
+from django.contrib.auth.models import User
 
 
 class LocationData(models.Model):
@@ -18,6 +19,7 @@ class LocationData(models.Model):
 
 
 class Location(models.Model):
+    users = models.ManyToManyField(User, related_name='locations')
     code = models.CharField(max_length=16, unique=True)
     name = models.CharField(max_length=64, unique=True)
     street = models.CharField(max_length=64, blank=True, null=True)