From 3950cd3320513acff9443135884b0d78ff1c0a6d Mon Sep 17 00:00:00 2001
From: Brian Moe <brian.moe@ligo.org>
Date: Mon, 9 Jul 2012 13:46:42 -0500
Subject: [PATCH] Support for filtering public 'latest' page.
---
gracedb/models.py | 5 ++++-
gracedb/views.py | 8 +++++---
templates/gracedb/latest.html | 3 +--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/gracedb/models.py b/gracedb/models.py
index dc95a9976..26588415b 100644
--- a/gracedb/models.py
+++ b/gracedb/models.py
@@ -1,4 +1,6 @@
from django.db import models
+from django.core.urlresolvers import reverse
+
import datetime
import thread
import string
@@ -165,7 +167,8 @@ class EventLog(models.Model):
def fileurl(self):
if self.filename:
- return os.path.join(self.event.weburl(), 'private', self.filename)
+ return reverse('file', args=[self.event.graceid(), self.filename])
+ #return os.path.join(self.event.weburl(), 'private', self.filename)
else:
return None
diff --git a/gracedb/views.py b/gracedb/views.py
index 29eceaff4..43b638b9a 100644
--- a/gracedb/views.py
+++ b/gracedb/views.py
@@ -984,6 +984,9 @@ class LimitedEvent():
return getattr(self._event, attr)
+def latest_limited(request):
+ return latest(request)
+
def latest(request):
context = {}
@@ -992,12 +995,10 @@ def latest(request):
else:
form = SimpleSearchForm(request.POST)
- if 'limited' in request.GET or 'limited' in request.POST:
+ if not request.ligouser:
limit = LimitedEvent
- context['limited'] = 'limited'
else:
limit = lambda x: x
- context['limited'] = 'notlimited'
context['form'] = form
context['rawquery'] = request.GET.get('query') or request.POST.get('query') or ""
@@ -1014,3 +1015,4 @@ def latest(request):
'gracedb/latest.html',
context,
context_instance=RequestContext(request))
+
diff --git a/templates/gracedb/latest.html b/templates/gracedb/latest.html
index 00ea3f1c3..11aad2ac4 100644
--- a/templates/gracedb/latest.html
+++ b/templates/gracedb/latest.html
@@ -11,10 +11,9 @@
{% block jscript %}
{% if not error %}
- <meta http-equiv="refresh" content="300;url={% url latest %}/?query={{rawquery|urlencode}}&{{limited}}">
+ <meta http-equiv="refresh" content="300;url={% url latest %}/?query={{rawquery|urlencode}}">
{% endif %}
-
{# http/https depending on this pages' protocol #}
<script src="http{% if request.is_secure %}s{% endif %}://ajax.googleapis.com/ajax/libs/dojo/1.7.1/dojo/dojo.js" type="text/javascript"></script>
<script type="text/javascript">
--
GitLab