views: add compatibility with URLs with embedded date

diff --git a/chloro/phyll/urls.py b/chloro/phyll/urls.py
index 99d6da61075f29a8dd7c054de1a924340f486ac9..14188107cd618c53a4cc6d0566bddd6eca886b79 100644 (file)
--- a/chloro/phyll/urls.py
+++ b/chloro/phyll/urls.py
@@ -39,6 +39,7 @@ urlpatterns = [
         staff_member_required(views.NoteDeleteView.as_view(), login_url='login'),
     ),
     url(r'^new-note/$', staff_member_required(views.NoteAddView.as_view(), login_url='login')),
         staff_member_required(views.NoteDeleteView.as_view(), login_url='login'),
     ),
     url(r'^new-note/$', staff_member_required(views.NoteAddView.as_view(), login_url='login')),

+    url(r'^(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/(?P<slug>[\w:-]+)/$', views.NoteView.as_view()),

     url(r'^(?P<slug>[\w:-]+)/$', views.NoteView.as_view()),
     url(r'^$', views.HomeView.as_view()),
 ]
     url(r'^(?P<slug>[\w:-]+)/$', views.NoteView.as_view()),
     url(r'^$', views.HomeView.as_view()),
 ]

diff --git a/chloro/phyll/views.py b/chloro/phyll/views.py
index d366b833f360b85ee25d0ba01170ab58c4aa3794..5387b705e5805550f47bdbd82fc2ecb28cbc1583 100644 (file)
--- a/chloro/phyll/views.py
+++ b/chloro/phyll/views.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

+from django.http import Http404

 from django.views.generic import CreateView, DeleteView, DetailView, UpdateView, TemplateView
 
 from .models import Note
 from django.views.generic import CreateView, DeleteView, DetailView, UpdateView, TemplateView
 
 from .models import Note


@@ -22,6 +23,19 @@ from .models import Note
 class NoteView(DetailView):
     model = Note
 
 class NoteView(DetailView):
     model = Note
 

+    def get(self, request, *args, **kwargs):
+        if kwargs.get('year'):
+            # check date does match
+            note = self.get_object()
+            creation = self.get_object().creation_timestamp
+            if (creation.year, creation.month, creation.day) != (
+                int(kwargs['year']),
+                int(kwargs['month']),
+                int(kwargs['day']),
+            ):
+                raise Http404()
+        return super(NoteView, self).get(request, *args, **kwargs)
+

 
 class NoteEditView(UpdateView):
     model = Note
 
 class NoteEditView(UpdateView):
     model = Note