diff options
Diffstat (limited to 'expo')
| -rw-r--r-- | expo/models.py | 3 | ||||
| -rw-r--r-- | expo/views_other.py | 24 |
2 files changed, 19 insertions, 8 deletions
diff --git a/expo/models.py b/expo/models.py index 3472a01..4c8332b 100644 --- a/expo/models.py +++ b/expo/models.py @@ -162,7 +162,8 @@ class PersonExpedition(TroggleModel): class Meta:
ordering = ('expedition',)
- get_latest_by = 'date_from'
+ #order_with_respect_to = 'expedition'
+ get_latest_by = 'expedition'
def GetPersonChronology(self):
res = { }
diff --git a/expo/views_other.py b/expo/views_other.py index 0f8cb79..1b3b64f 100644 --- a/expo/views_other.py +++ b/expo/views_other.py @@ -5,8 +5,7 @@ from django.db.models import Q import databaseReset
import re
import randSent
-from django.http import HttpResponse
-
+from django.http import HttpResponse, HttpResponseRedirect
from django.core.urlresolvers import reverse
from troggle.alwaysUseRequestContext import render_response # see views_logbooks for explanation on this.
@@ -62,9 +61,20 @@ def calendar(request,year): def controlPanel(request):
message = "no test message" #reverse('personn', kwargs={"name":"hkjhjh"})
if request.method=='POST':
- for item in request.POST:
- if request.user.is_superuser and item!='item':
- print "running"+ " databaseReset."+item+"()"
- exec "databaseReset."+item+"()"
+ if request.user.is_superuser:
+ for item in request.POST:
+ if item!='item':
+ print "running"+ " databaseReset."+item+"()"
+ exec "databaseReset."+item+"()"
+ else:
+ return HttpResponseRedirect(reverse('auth_login'))
+
+ return render_response(request,'controlPanel.html', )
- return render_response(request,'controlPanel.html', )
\ No newline at end of file +def downloadCavetab(request):
+ from export import tocavetab
+ response = HttpResponse(mimetype='text/csv')
+ response['Content-Disposition'] = 'attachment; filename=CAVEETAB2.CSV'
+ tocavetab.writeCaveTab(response)
+ return response
+
\ No newline at end of file |