Merge lp:~beuno/wikkid/show-last-person-to-change into lp:wikkid

[Martin Albisetti]

This shows the last person who changed a page and the date.

This branch has a disabled test, from what I could see from 30.000 feet with turbulence, the tests don't actually commit any changes, they just mock it. I'm not sure how to make it work so I left it there but disabled.

[Tim Penhey (thumper)]

Accepted with some tweaks.

review: Approve

[Tim Penhey (thumper)]

I added last_modified_date and last_modified_by into the model interface as well.

last_modified_date now returns a datetime object naive but in UTC.

the last_modified_by from the model returns a user object.

[Tim Penhey (thumper)]

Volatile filestore was updated to remember last_modified_by and last_modified_date.

=== modified file 'wikkid/filestore/bzr.py'
--- wikkid/filestore/bzr.py	2010-06-01 08:34:44 +0000
+++ wikkid/filestore/bzr.py	2010-06-06 22:32:26 +0000
@@ -247,6 +247,13 @@
         return rev.get_apparent_authors()[0]
 
     @property
+    def last_modified_date(self):
+        """Return the last modified date for the revision."""
+        repo = self.working_tree.branch.repository
+        rev = repo.get_revision(self.last_modified_in_revision)
+        return rev.timestamp
+
+    @property
     def _is_binary(self):
         """True if the file is binary."""
         try:

=== modified file 'wikkid/skin/default/base.html'
--- wikkid/skin/default/base.html	2010-05-22 20:21:33 +0000
+++ wikkid/skin/default/base.html	2010-06-06 22:32:26 +0000
@@ -41,9 +41,7 @@
   <div id="main">
     {% block content %}{% endblock %}
   </div>
-<!--
-  <p class="last-edit">Last edited by Foo Bar on Apr 1st, 2010  (<a href="#" title="View log">view log</a>)</p>
--->
+  {% block footer %}{% endblock %}
   <div id="footer">
     &copy; 2010
     <a href="https://launchpad.net/~wikkid">Wikkid Developers</a>,

=== modified file 'wikkid/skin/default/page.html'
--- wikkid/skin/default/page.html	2010-05-06 08:37:10 +0000
+++ wikkid/skin/default/page.html	2010-06-06 22:32:26 +0000
@@ -1,9 +1,14 @@
 {% extends "base.html" %}
 {% block title %}{{ view.title }}{% endblock %}
-{% block content %}{{ view.content }}{% endblock %}
+{% block content %}{{ view.content }}
+{% endblock %}
 {% block commands %}
 {% if view.user %}
 <a class="command" href="{{view.request_path}}?view=edit">Edit</a>
 <a class="command" href="{{context.dir_name}}?view=listing">Browse</a>
 {% endif %}
 {% endblock %}
+{% block footer %}
+<p class="last-edit">Last edited by <strong>{{ view.last_modified_by }}</strong>
+    on {{ view.last_modified_date }}</p>
+{% endblock %}

=== modified file 'wikkid/skin/default/static/default.css'
--- wikkid/skin/default/static/default.css	2010-05-31 12:45:14 +0000
+++ wikkid/skin/default/static/default.css	2010-06-06 22:32:26 +0000
@@ -127,7 +127,7 @@
     line-height: 1.4em;
 }
 p.last-edit {
-    font-size: 0.8em;
+    font-size: 0.6em;
     margin-left: 1em;
 }
 ul, ol, dl {

=== modified file 'wikkid/tests/views/test_edit.py'
--- wikkid/tests/views/test_edit.py	2010-06-01 08:47:24 +0000
+++ wikkid/tests/views/test_edit.py	2010-06-06 22:32:26 +0000
@@ -19,7 +19,7 @@
         self.user = TestUser('[e-mail]', 'Test User')
         self.request = TestRequest()
 
-    def test_title_nexted(self):
+    def test_title_nested(self):
         """Test that a nested page returns the expected title"""
         factory = self.make_factory([
                 ('SomePage/SubPage/Nested.txt', 'some text')])

=== added file 'wikkid/tests/views/test_view.py'
--- wikkid/tests/views/test_view.py	1970-01-01 00:00:00 +0000
+++ wikkid/tests/views/test_view.py	2010-06-06 22:32:26 +0000
@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2010 Wikkid Developers.
+#
+# This software is licensed under the GNU Affero General Public License
+# version 3 (see the file LICENSE).
+
+"""Tests the display views."""
+
+from wikkid.dispatcher import get_view
+from wikkid.tests.factory import FactoryTestCase
+from wikkid.tests.fakes import TestRequest, TestUser
+
+#XXX: This test fails, it seems to not actually commit, may need more faking
+class DisabledTestView(FactoryTestCase):
+    """Test the display view."""
+
+    def setUp(self):
+        super(TestView, self).setUp()
+        self.user = TestUser('[e-mail]', 'Test User')
+        self.request = TestRequest()
+
+    def test_last_modified_by(self):
+        """Test that the last committer is displayed properly"""
+        factory = self.make_factory([
+                ('SomePage/SubPage/Nested.txt', 'some text')])
+        info = factory.get_resource_at_path('/SomePage/SubPage/Nested.txt')
+        view = get_view(info, 'view', self.request, self.user)
+        self.assertEqual('Test User', view.last_modified_by)
+

=== modified file 'wikkid/view/wiki.py'
--- wikkid/view/wiki.py	2010-05-16 04:03:04 +0000
+++ wikkid/view/wiki.py	2010-06-06 22:32:26 +0000
@@ -6,6 +6,8 @@
 
 """View classes to control the rendering of wiki pages."""
 
+from bzrlib.osutils import format_date
+
 from twisted.web.util import redirectTo
 
 from wikkid.formatter.registry import get_wiki_formatter
@@ -30,6 +32,14 @@
         content, formatter = get_wiki_formatter(bytes, 'rest')
         return formatter.format(self.context.base_name, content)
 
+    @property
+    def last_modified_by(self):
+        return self.context.file_resource.last_modified_by
+
+    @property
+    def last_modified_date(self):
+        return format_date(self.context.file_resource.last_modified_date)
+
     def _render(self, skin):
         """If the page is not being viewed with the preferred path, redirect.