From ab558c1ccce9c209a4f38016a376ad6589548b0f Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Mon, 18 May 2015 15:21:44 +0100
Subject: [PATCH] Add event history view

---
 RIGS/rigboard.py                            |  31 --------------------
 RIGS/templates/RIGS/event_detail.html       |  10 +++++--
 RIGS/templates/RIGS/event_version_list.html |   2 +-
 RIGS/urls.py                                |  10 ++-----
 db.sqlite3                                  | Bin 19678208 -> 19678208 bytes
 5 files changed, 10 insertions(+), 43 deletions(-)

diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py
index de0fa0fe..648377a3 100644
--- a/RIGS/rigboard.py
+++ b/RIGS/rigboard.py
@@ -296,34 +296,3 @@ class EventRevisions(generic.ListView):
         }                     
 
         return context
-
-class EventDiff(generic.TemplateView):
-    model = reversion.revisions.Revision
-    template_name = "RIGS/event_detail.html"
-
-    def get_context_data(self, pk, source, dest=None):
-        model = get_object_or_404(models.Event, pk=pk)
-        revisions = reversion.get_for_object(model)
-        source = revisions.get(pk=source)
-
-        if dest:
-            dest = revisions.get(pk=dest)
-        else:
-            dest = reversion.get_for_date(model, datetime.datetime.today())
-
-        diff = {
-            'pk': pk, # need this for the edit button to work
-        }
-        for field in source.field_dict:
-            html = generate_patch_html(source, dest, field, cleanup="semantic")
-            # tidy up
-            html = html.replace("&para;", "")
-            diff[field] = html
-
-
-        context = {
-            'object': diff,
-            'event': diff
-        }
-
-        return context
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html
index d8465be6..5b841cc0 100644
--- a/RIGS/templates/RIGS/event_detail.html
+++ b/RIGS/templates/RIGS/event_detail.html
@@ -225,8 +225,10 @@
                     {% endif %}
                 {% endif %}
             </div>
-            <div>Last edited at {{ object.last_edited_at|date:"SHORT_DATETIME_FORMAT" }}
-                by {{ object.last_edited_by.name }}.
+            <div>
+                <a href="{% url 'event_history' object.pk %}">
+                    Lasted edited at {{ object.last_edited_at|date:"SHORT_DATE_FORMAT" }} by {{ object.last_edited_by.name }}
+                </a>
             </div>
         </div>
         {% endif %}
@@ -238,7 +240,9 @@
     {% block footer %}
         <div class="row">
             <div class="col-sm-10 align-left">
-                Lasted edited at {{ object.last_edited_at|date:"SHORT_DATE_FORMAT" }} by {{ object.last_edited_by.name }}
+                <a href="{% url 'event_history' object.pk %}">
+                    Lasted edited at {{ object.last_edited_at|date:"SHORT_DATE_FORMAT" }} by {{ object.last_edited_by.name }}
+                </a>
             </div>
             <div class="col-sm-2">
                 <div class="pull-right">
diff --git a/RIGS/templates/RIGS/event_version_list.html b/RIGS/templates/RIGS/event_version_list.html
index ace69b67..25f27a04 100644
--- a/RIGS/templates/RIGS/event_version_list.html
+++ b/RIGS/templates/RIGS/event_version_list.html
@@ -26,7 +26,7 @@
         <tbody>
         	{% for version in object_list %}
             <tr>
-           		<td>{{ version.revision.pk }}</td>
+           		<td>{{ version.pk }}|{{ version.revision.pk }}</td>
                 <td>{{ version.revision.date_created }}</td>
                 <td>{{ version.revision.user.name }}</td>
                 <td>{% for key, old, new in version.changes %}
diff --git a/RIGS/urls.py b/RIGS/urls.py
index fde9a772..c02e74a2 100644
--- a/RIGS/urls.py
+++ b/RIGS/urls.py
@@ -80,15 +80,9 @@ urlpatterns = patterns('',
                        url(r'^event/archive/$', login_required()(rigboard.EventArchive.as_view()),
                            name='event_archive'),
 
-                       url(r'^event/(?P<pk>\d+)/version/$',
+                       url(r'^event/(?P<pk>\d+)/history/$',
                            permission_required_with_403('RIGS.view_event')(rigboard.EventRevisions.as_view()),
-                           name='event_revisions'),
-                        url(r'^event/(?P<pk>\d+)/version/(?P<source>\d+)/$',
-                           permission_required_with_403('RIGS.view_event')(rigboard.EventDiff.as_view()),
-                           name='event_diff'),
-                        url(r'^event/(?P<pk>\d+)/version/(?P<source>\d+)/(?P<dest>\d+)$',
-                           permission_required_with_403('RIGS.view_event')(rigboard.EventDiff.as_view()),
-                           name='event_diff'),
+                           name='event_history'),
 
                        # Finance
                        url(r'^invoice/$',
diff --git a/db.sqlite3 b/db.sqlite3
index a40be46b233503425b208eb5bd1a2c934f936236..bc5f7ea52f0b1e3d46c5e2686470e96b44d8a2c9 100644
GIT binary patch
delta 2898
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

delta 2241
zcmYk-dvsLA9l-JXo7v546G9#kNU~&;&E`oouO*KnjZ~u~MxcdSD;AUl2}Ba3C{>CS
zQ-gvgNYjf_y+Nvg#Y$==r9y5>5lRcx2NbH(3Z>MdQfy5_@e#j6|LHmV`R<%MbLPzM
z*}Zq=>b~fe=uV5<W?A(KmQ~khS<<&Iufn^{Dmoj{*Z5|P)UU7bO;3$aNzf&#z3JYj
z_Pd)~m&|3<Yz7m3FZcQyKO61US(biBuhTnqi_X$n{RthrXDd69p1jMGtsBHyJ1r!E
zoJh;ELgA`KOBc2;E1th#N%5k)Di_?-RDOR&)8fiImR6PCSF*T0!fx@&hIp@Tvh*pv
zS8vuGx=Gs!EjrvE=-6F*dD~ahr<4|#go}!KRRu~atHa^yaOoArW#whX;mFRWc!7e3
z2VO+L%tav@G4LT4aTtYoj79<yk%VN7!C0hV9L6IRX-J136Oe%bGLeNKvJpZKa*>C8
z6rd0jQG_dSC5lmkQk0<_VN5~=Dp7@Md<Bzn6{g^;sKM2kim%}sT#H&<hwCv7b*RS;
zXuyq_jv1JVuj3n-h1vKfZo;>4Gro;mFbB8dJD7`kxDB^sJ{r-41-JtX(Tqh{j27I9
zC1^z(?m|26#ywbydvPC@;k&pW4`4aIhZT4bEAf4-!b9l55AZNLu^NxyQLMpQJch^7
zg>J0F6IhQQq6a^MjSYAbPhlf|jHmGo9Q0xnp2cST1kd4lY{6D+!wdK+w&O+o3@>2^
z`tWnSj9=gt>_k6)iCy>=Ud3+g!2nzg;@8-V-(VkJ!+spVZ*dU6!|!njhj9dd!0UJe
zZ{jT+#WDO5$8iFG!rOQU@8Tr>jKAPLoWg1R6=(1_oW<YqKK_Ao_y8Z`Bb>)SaRDFW
zU-&mZ!4Up~VO+$2aS5N|GklIOFtUdKeiuxXi8k?=cugWqB2A)9qD^8<d?v9baVDco
zE^js3j1o)|O_EHKO~#mvHAyiUXENR-)g(<^ZVlpe>v`5$C$cwPn(elEv*sr$9rJ}1
zsg?2-6?Oja-95|ngb{tab%B+Bc}=u)nD-24d9`1n-66*Dg?grxIFX0^ve`~ttuoB*
zb)l1S*e_mp5<L>(xkUynr>$jztZ*LP9+2^lbCgZ&!Ct9#JjeX<0(WXl6|TA5wWjU>
zmuq99?i4RK=V`-sdRxIE=frz{$&9Vrv8uD3i*r|Xwz}R^ei=y|ca!v3@`~)?h==8v
zoRk;kIeA)ooWLi3*=TRd+fZV^K5KoHec_r~uQSBOZYO!zFQdD9hWtV%m}Hm)OfpTf
z#O)ahO6#ShC^>HFgSuVk>QU;T%9LSo5(e{SzxlA|W3RM=VG&W&IIDa7<7_EP^h}be
zmOZ&wO?B!#At|sEJ(0y`^)vR9y~^h{ctg@ZHCjoBrS?h(+ilO6ezRcE?ck}jQh8D&
zVA+AKD&5JxAtZ@*LVEH!d)`(R>E<?s<YcO6x~#VB8G(pKr)6PCs?CDaPE9ynBHYKD
zL(<xyEURl|XGq+UojKzDC_X}6wDeKERWH{wbhffLEju^dA9#Q6dC~bNe9nVgawW|j
zOV5w<l&guBePhkqIX-o>nxU>!Q&d>l2{qod{=g3Zv*J$Nn=2>AL@HHp=^!%~q}uEi
zq1^hnb7hyrXo<4)Qq?9==46*9tZMAOKGn*%9-7T}mFds)mswU(TpAB|rBqyh&Ys|8
z8C6zQSz1vVen4*1bJTRZZ6G){GS0FTYwX7cf}cBA_2o;7J@R~IguTTL-fDaH1(WT>
z4^^t3-F>Z7v!7W}cEi5lOeg-+0`WQ<a|$Hh9@zGj&)u^jARmZbu%<HKeq(>|YUfB@
z9;Zt^5NvefPUkax_&{()m*-5bkUVicXYxhA>+R>)cCjmVut40{!9wXuN-i%d4gcTs
Ry&_y3E_Gjet59aPeF?_x+=l=F