summaryrefslogtreecommitdiffstats
path: root/expo/views_other.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-24 23:24:59 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-24 23:24:59 +0100
commit4735edb9d08d8bb17ae00018d3bb087206afc09f (patch)
treeab258cb84b3f3ceb3fd619db850272a7f160a6c4 /expo/views_other.py
parent18e080418f3b2f29c431d081d43bc5f5bc2846c4 (diff)
downloadtroggle-4735edb9d08d8bb17ae00018d3bb087206afc09f.tar.gz
troggle-4735edb9d08d8bb17ae00018d3bb087206afc09f.tar.bz2
troggle-4735edb9d08d8bb17ae00018d3bb087206afc09f.zip
[svn] Have control panel display an error for logged in, non-superuser users.
Diffstat (limited to 'expo/views_other.py')
-rw-r--r--expo/views_other.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/expo/views_other.py b/expo/views_other.py
index 504d1f6..f5944a6 100644
--- a/expo/views_other.py
+++ b/expo/views_other.py
@@ -65,7 +65,7 @@ def controlPanel(request):
if request.user.is_superuser:
#importlist is mostly here so that things happen in the correct order.
- #http post data seems to come in an unpredictable order, we do it this way.
+ #http post data seems to come in an unpredictable order, so we do it this way.
importlist=['reload_db', 'import_people', 'import_cavetab', 'import_logbooks', 'import_surveys', 'import_QMs']
databaseReset.make_dirs()
for item in importlist:
@@ -74,7 +74,10 @@ def controlPanel(request):
exec "databaseReset."+item+"()"
jobs_completed.append(item)
else:
- return HttpResponseRedirect(reverse('auth_login'))
+ if request.user.is_authenticated(): #The user is logged in, but is not a superuser.
+ return render_response(request,'controlPanel.html', {'caves':Cave.objects.all(),'error':'You must be a superuser to use that feature.'})
+ else:
+ return HttpResponseRedirect(reverse('auth_login'))
return render_response(request,'controlPanel.html', {'caves':Cave.objects.all(),'jobs_completed':jobs_completed})