From 43d2ad6352f30496bb1c82235eb0c6b5aca01e92 Mon Sep 17 00:00:00 2001
From: CVi <christoffer@viken.me>
Date: Sun, 16 Aug 2015 15:57:48 +0200
Subject: [PATCH] Typos and migrations

---
 mercantile/.models.py.swp | Bin 12288 -> 0 bytes
 mercantile/admin.py       |   8 ++++++++
 waffles/admin.py          |   4 ++--
 waffles/models.py         |   2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 delete mode 100644 mercantile/.models.py.swp

diff --git a/mercantile/.models.py.swp b/mercantile/.models.py.swp
deleted file mode 100644
index 81b3a823527cc78cf2658677644c719fafe44de2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2v2GJV5QZo80R*C;TS#L|<}MH+5Qv7DNKs-535;mhzPZhYz1!2?`jDIO1W=^_
zUIHi(6m)q33JQAOfQAm3%bk<6k&G*(pjqkH`ZTjU|9w-PJcHFon>}$OSOZ#T0S;b#
z?*G_-4xerVXp^HV%E0`Up?7+?W8M5T*sCrKyI7#HS%Rq#3mF@osxUz}l&RMS!^B2t
z@*o@k<vI>C0Vc30fsv1|++2pWYgbpxBP*9LiSy_Bi=O5@Ccp%k025#WOn?b60Vco%
z{sRI&TY_iw9;fPexmfQ@Gkg8W8xvpxOn?b60Vco%m;e)C0!)AjFaaiT0tv_nAY2A`
zLn{COpM3v+I|J~Z^qTaF^pdnkdQ9q&fb{D$z)#Xw(g)H$$&z}cZPFI$I_U!GJKg_<
z^p5nFbXe~M@?y(OfC(@GCcp%k025#WOn?b6fqzCo(2|KArC!_-^{Dh_>QSNF&}gDo
z8_JYOdV8GEl^&;}IA|Q-unx6Kw{YC*QlJe(BlBE5K<^EfQ`)V%POqHIZr_3xu`QLO
zv27s>VY5u_9(*i^zw5#{UHG9+ri#<_chh{M`n@tz`(MQ2x-`R)kzU*MPm8udm+L29
zls}GKc0_EQFjgtDKe0@;uwlC4sGp;|?`%wS>Bqk4f+O_va%bCgSF4#$RiI1gv;Jv9
zSFAgvzKO9Nxw_M02OS0wJDZ57GL8-ALDd_flgv6V4iR=l!*`V(?aEZyAR0^(t7GsR
DP!|3E

diff --git a/mercantile/admin.py b/mercantile/admin.py
index 8c38f3f..8608ee5 100644
--- a/mercantile/admin.py
+++ b/mercantile/admin.py
@@ -1,3 +1,11 @@
 from django.contrib import admin
 
+from .models import Calculation, Debt, Settlement
+
+
 # Register your models here.
+
+
+@admin.register(Calculation, Debt, Settlement)
+class GenericAdmin(admin.ModelAdmin):
+    pass
diff --git a/waffles/admin.py b/waffles/admin.py
index 7120b03..baa2e98 100644
--- a/waffles/admin.py
+++ b/waffles/admin.py
@@ -1,11 +1,11 @@
 from django.contrib import admin
 
-from .models import UserProfile, Community, Event
+from .models import UserProfile, Community, Event, Listing, ShoppingList, Subevent
 
 
 # Register your models here.
 
 
-@admin.register(UserProfile, Community, Event)
+@admin.register(UserProfile, Community, Event, Listing, ShoppingList, Subevent)
 class GenericAdmin(admin.ModelAdmin):
     pass
diff --git a/waffles/models.py b/waffles/models.py
index adebf00..d8164a6 100644
--- a/waffles/models.py
+++ b/waffles/models.py
@@ -41,7 +41,7 @@ class Subevent(models.Model):
 
 class ShoppingList(models.Model):
     name = models.CharField(max_length=64)
-    price = models.IntField
+    price = models.IntegerField()
     payers = models.ManyToManyField(UserProfile)
     subevent = models.ForeignKey(Subevent)