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
zcmYc?2=nw+FxN9?U|?VnU|=}hcOmrqlwO8C)(i}pImM~zWgrRsxFEHpC^I=DzX-oF
zhB}CW`Yx$usX6%txv6<2`elh}IhlFs`njn^$%%O-nK`NYx%nxnImLPfl?03%l^zX&
z(GVau1WHTNbS-!pjExKpKw6ZQ6cvPpLP5+?JQ@O{Aut*OqaiRF0;3@?8UmvsFd71*
zAuvKhprnA2p`L+(feGqgNhr;TMnk!y)MyBdhQMeDjE2By2#kinXb6mkz-S1JhQMeD
zjE2By2#kin5DbCD6b1%;UIvEsypZ{SSpWYqKLf*7eg=kF{0s~;`572y@G~&f@iQ<)
z@G~&z@G~$l@G~&{=VM^_$H%~MgO7n>J0AnX6g~!qd_D#SUp@u~A3g>KZ$1VFQ$7X;
zQ9cHSPrM8aS9lp1Hu5qsY=GG}1jB38$)h1K8UmvsFd71*Aut*OqaiRF0;3@?8Umvs
zK(`Q3P*6}v%*`*&D^ajjfG(Bx%qvMvPc3rGOwCEr&}0B9Nl7fpM<{SfEJ;O?O-(}5
z?v`Janwg&Gom#2klA2Va$&j3rSX`_SoLW+nlL}g;tpT;i7ql{4(~3b^!6z}jC^Iiz
zA+by$zn~yJ>+lZH;%}(Msi+o*Wagq+o?4cQ?06*GT|qKX_Y>nn=fs@k(wxMS%=|n|
zC+3%>78Pe^mneW3a98Rmq~#YW<m9KPXXd3dFhIg8HK`;O$<atI3N2183Mk4?%gjkd
zxGTR1;X!<A(WA*JGaW6aAOQ^ubaeMKFeocH7o{eaq$*VAmli=|S|KB~C{>RkttdZN
up*%4yEhn{D4-z*DnYjh|MI{R0Ak<MnayLYEN>*ZCdcIyt5=<dP8v_7P7XAJJ
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)