X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=quotes%2Fviews.py;h=642cb433581d953dcd1fced549bd7a784ebd394d;hb=8f47dcb74ef6de59596a2fffd420c2acac8dcd19;hp=9ff7aacc996bd07db6077490ace90d4b8c7b9d7d;hpb=5a0c0284b85a13255f86513565d145ebecfa9637;p=djsite.git

diff --git a/quotes/views.py b/quotes/views.py
index 9ff7aac..642cb43 100644
--- a/quotes/views.py
+++ b/quotes/views.py
@@ -5,7 +5,6 @@ from random import randint
 from quotes.models import Author, Work, Quote, QuoteTag
 from quotes import search
 from quotes import tagcloud
-from quotes.massimport import domassimport
 
 # create your views here.
 def index(request):
@@ -13,13 +12,17 @@ def index(request):
 
 def onequote(request, quote_id):
     q = Quote.objects.get(id=quote_id)
-    q.incr_display()
-    context = { 'quote' : q }
-    return render(request, 'quotes/onequote.html', context)
+    return _onequote(request, q)
 
 def random(request):
     count = Quote.objects.count()
-    return onequote(request, randint(1, count))
+    q = Quote.objects.all()[randint(0, count-1)]
+    return _onequote(request, q)
+
+def _onequote(request, q):
+    q.incr_display()
+    context = { 'quote' : q }
+    return render(request, 'quotes/onequote.html', context)
 
 def tags(request, tag_id):
     tag = QuoteTag.objects.get(id=tag_id)
@@ -52,10 +55,3 @@ def searchpage(request):
 def cloud(request):
     clouddata = tagcloud.build_cloud()
     return render(request, 'quotes/cloud.html', clouddata)
-
-def massimport(request):
-    if 'quotes' in request.POST:
-        resultcontext = domassimport(request.POST['quotes'])
-        return render(request, 'quotes/domassimport.html', resultcontext)
-    else:
-        return render(request, 'quotes/massimport.html', {})