From c4a14e97c25f7f8303e852fa7762096f32f5319e Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Thu, 22 Jan 2015 19:31:43 +0000
Subject: [PATCH] Fix for issue #4. Changed edited by username to standard name
 format.

---
 RIGS/models.py                        |   8 +++-----
 RIGS/templates/RIGS/event_detail.html |   3 ++-
 db.sqlite3                            | Bin 19217408 -> 19218432 bytes
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/RIGS/models.py b/RIGS/models.py
index a7d2d50f..ba1f9de2 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -7,7 +7,6 @@ from django.conf import settings
 import reversion
 
 
-
 # Create your models here.
 class Profile(AbstractUser):
     initials = models.CharField(max_length=5, unique=True, null=True, blank=True)
@@ -75,7 +74,7 @@ class Organisation(models.Model, RevisionMixin):
         if len(self.notes) > 0:
             string += "*"
         return string
-    
+
     class Meta:
         permissions = (
             ('view_organisation', 'Can view Organisations'),
@@ -131,7 +130,7 @@ class Venue(models.Model, RevisionMixin):
         if self.notes and len(self.notes) > 0:
             string += "*"
         return string
-    
+
     class Meta:
         permissions = (
             ('view_venue', 'Can view Venues'),
@@ -245,7 +244,7 @@ class Event(models.Model, RevisionMixin):
 
     def __str__(self):
         return str(self.pk) + ": " + self.name
-    
+
     class Meta:
         permissions = (
             ('view_event', 'Can view Events'),
@@ -286,7 +285,6 @@ class Invoice(models.Model):
     void = models.BooleanField()
 
 
-
 class Payment(models.Model):
     CASH = 'C'
     INTERNAL = 'I'
diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html
index 5d3eb9e9..82bd0baa 100644
--- a/RIGS/templates/RIGS/event_detail.html
+++ b/RIGS/templates/RIGS/event_detail.html
@@ -138,7 +138,8 @@
             <a href="{% url 'event_duplicate' event.pk %}" class="btn btn-default" title="Duplicate Rig"><span
                     class="glyphicon glyphicon-duplicate"></span></a>
         </div>
-        <div>Last edited at {{ object.last_edited_at|date:"SHORT_DATETIME_FORMAT" }} by {{ object.last_edited_by }}.
+        <div>Last edited at {{ object.last_edited_at|date:"SHORT_DATETIME_FORMAT" }}
+            by {{ object.last_edited_by.name }}.
         </div>
     </div>
 {% endblock %}
diff --git a/db.sqlite3 b/db.sqlite3
index fea6c73809a4ab51a0d61413523fa4beebe86363..ea8e552c164aaa887ed8157f4095c72a4ad23c69 100644
GIT binary patch
delta 1976
zcmY+^eSA%I9KiAOJ?HM>ZZmr{cXMYCwz{m@CUiy3CX6yejMOG0lh}yz5POg{)=c3L
zb*@rU%BU<oxOs?_JPsobMdcw()JC;FC;stz-S_8re!u%W=XK6`-PbK@Tx=~WT4Jq=
zkbWE5jQ0(%3k%ee)yZR~jhQ?pf6~Mpj`Gce4$Y-5-!hl4K!pYiJm3j0c*6=Gn0x)u
z0{&=;00bfk!3aSpS|JRrVM90~&<1uyqAj8jjTpqD9pVs=yKpxgXpas^z&%JrM<gK`
zDd>cI(HULP75Bl3Znz)a(E|_QL8PK5(vXf`cnH1G2Yr!&e&~;f@dySW69bWjK^Tl7
zcoai14A~f7<MJJm?v#?6GrdNv7P(SZ-g^Wd!$>@iCy;|&jKY%`T~ppWZ|2(A0LfOg
zBicHxM9bC^HH&&&tybr$Bh?huTTV!|%oRN_LF=PO)dio|97pHqCmZr?!Om_e&TdJ`
ziJenAB_$;(6^^5`|No-Q)sTlV7>lPc4*3|5r!fJ~U?L`=0EL*0DR>rBF%8e*c}&L)
z%)~6bfZ3RXA{3(prI?EsF%M;U3FVlN1*pKwsKi24VG&-zt5}RBSPC7>upF;p1y<s9
zya59)tiqdk3#;)q-oYBYi?w(U?_(W4z=v3mYHYwpe1wnj2{xeypJFpU!{_({Ut$Z~
z_zGLG4coB;Ut=eB;T!D6xA+cw@ICfoANJz_4&o4MaTrH%6m>X;<M;t5@FVJR5~pw)
zKjCMb!CCx*U-28x;XE$jB7VmuT*ehN;41#WHC)G^_zR6_!VTQS-}ndrqIrR<K^DS{
zYDP0-G2>yz(~OrHZ!=aiK4yH)_?c;8#@|d!GXZ7-%><bVHWOkdRNStHR+2YEw^S$Y
zH4aV)lMweM8l-u9X`=ZmrNxy6VNzMp8aCNd5H6P7p<|VE3ZDk0Nkps?C^m@}ha`(r
zdP;_5$#5AZ`BEs;rC7>kkt~;0vQ{?8X4xvc<$xTM({fH4q)8Rkss^eyHClBTy)K4J
z=U~ySTA*grqBVz>tU0xwT83V|I=)lLRjo;D^16LnwYNt1&HdrhSB<*8y65(|@6KJN
zbw>K3a9Lkj8!lUFBgC>t%TX>HUamGW%2T;4qBQEc3E6qZL00TmZ%x&Fvy{?0cO!GZ
z6&Aaas~A4H5z@tYpu1gC0`B~)=+NvgVtKA^$y6g1y<lbfY-4^@jMxmL)-IkBsaLH`
z&vAPkw)3KRud1q4a8CRYyVP5~M@xT2Q8EVV0qx>98QV_TWr0UVW=YvF_n^~u*%)M*
zAbyJOKP3K`e%jS5#C`pmU0McPGR3Lr15ztS8hPH4lB$YRuS%_mG<GnXVQJ>>7p7Sw
zg|syjWhUB8jG0(*r&-&{wi}lAQm^RUU22-q&k`pAs?^s6E^A#P#s!Z!@snn^Ikxg|
zskT)-lte`vtZq^gMK=OmQ4;A>Y+ITYu5>N-u<3<6$A%a^TE$70XXd!5u~R1+l}sF3
z-=%|%!pd0LZ7d6olQJ(JR_7GG@X&=Yx4D0N+@{56OT=21?W2UMq2<x;h0$?RBi=E$
dt`nnY?HbroFIwYB(5n~BavJrqas1wz{{s!kWHJB%

delta 1802
zcmXZYdwh*`9KiAC`+J_VbI#7}ip|*$v)QCYA@|!tj5G}ul3ODr<`Om1E;4M*-LrCe
zPSHh_p{$5gE|mz`Tr#;tMeAZNS(JR9SN?c^zTfBf`u*{HJvlkc+&MK%-3wzSZByJh
zkN0?Vgx*|D9yM*$<SAn(P8h~E)?QL>=leYcevd#whXDtI;Difq1jD`?f?5bg7{U>O
zNJODF>Yy&75rca0A{KG*p*|WQ9u1LzL^MJYlF=CVpb73p3hqNwG{gOP0L{??E%6{)
zp*7l|E!v?yI-nyup)<N56%U~+x}iHBMi2Bv8hW8O9zh>GigfhFW5_^1^v3`^jwkRW
z24YZ|-!r&dJIO7((0%Y)kt+rBdJM)>7=ouU6vHqaBQO%rl+EjrIb&Tyn9SDnWBLX?
zPami^(+zb}m8v;vh-#r+a!N{Nc3DJ8%uvyr9G_*Lsm|noS7%}rM&ntG!B~vLa~O~3
zF#!{ig-Mu<DVT~EFb&i3B3?o^W?&{>#w@&o9ONPo`IwDYF$V>hi+PxjLKNXO6k`Dv
zVi6W&36^3Rmcv8|UdJ0)ft6T=)v(~ln|KRruoiFQ9lVS8unzBIJvQJ2e29%G#U^aV
z7JP({u@z<b1fOCXw&OGGz)l44IljOy?8YAK#h3UBUt=G>!G0XTw>XGHIE?Rb1m&o}
zQ5?f@oWS=uiAtQp4>*l8IE!=m5$ACMKjCNmf{VC>Ur~kM@H_s%pSX-_T)|ab!*%?H
z8>qqGxQSc%2mj(W{wwrX%L3R@c62+29fzGDJ5D<;J8nC{c06`M?9{RoYA4K2xSa?)
zk#?f&)V5Pc0{-f{l9_E9Y0iVzk@3+|TjlKyoMnm8i?gDoI4cJAWM`IFjNvh3v`S68
zs@)P@JQ5|bk|-(CQaV_!)F{blm9Glb6176DQR~$fwO#F2`&GHBROeNdx~gvJy6(}V
z^jJMnPtjZI9keR#yjE$J4oGg>(CO4g_h|VQcjuwI^T6Gi7r1oTD{0EgDEG?7&>&q@
zNW|s;M|E+9S9Vs!ig7?6s?}Idf1HdkM6?<+%N0DxEITo`mUV<fpL@DfSIX0@X?CE7
z?~oNnoR*_m!NX&vwbi+!Pg+=qyZ9tNu#kPKX{4)U&CFWaZI(4ZK0)ePR)tT3%ta-R
zVFBZ)PrTwvS>@0*m9jdJe9R}O-L8?+Pt&wsea-Mj$y=>mXMIxWh+Ldk&_2-boKH4K
znnqFM3+Bv=+g#>le|JaV`Zb?~MH%VRRWs95i-uU4uKJQ{7N-`)TYFfuty80Y;$G0x
zU0+B8JMnfJ+DWjJD1n~tMzZ6k(L|~=v!h>iwR#&#5?&V3$G1qV(~cww3EZH;p<z7E
zq3zf7{%WggAf^@WkC*L6Zrbwx)}-P@*=Lp1Ns<C*Zq)J&uhzz#R9+Pw=u|gJb|>8d
DStB@l