diff options
Diffstat (limited to 'expo')
| -rw-r--r-- | expo/context.py | 5 | ||||
| -rw-r--r-- | expo/models.py | 2 | ||||
| -rw-r--r-- | expo/views_caves.py | 1 | ||||
| -rw-r--r-- | expo/views_other.py | 18 |
4 files changed, 17 insertions, 9 deletions
diff --git a/expo/context.py b/expo/context.py index 06215ce..bb38a84 100644 --- a/expo/context.py +++ b/expo/context.py @@ -1,4 +1,5 @@ from django.conf import settings +from expo.models import Expedition -def settings_context(request): - return { 'settings':settings }
\ No newline at end of file +def troggle_context(request): + return { 'settings':settings, 'Expedition':Expedition }
\ No newline at end of file diff --git a/expo/models.py b/expo/models.py index 74a26d4..798fa35 100644 --- a/expo/models.py +++ b/expo/models.py @@ -21,7 +21,7 @@ class TroggleModel(models.Model): return self._meta.object_name
def get_admin_url(self):
- return settings.URL_ROOT + "/admin/expo/" + self.object_name.lower() + "/" + str(self.pk)
+ return settings.URL_ROOT + "/admin/expo/" + self.object_name().lower() + "/" + str(self.pk)
class Meta:
abstract = True
diff --git a/expo/views_caves.py b/expo/views_caves.py index 691cdcb..51c9e11 100644 --- a/expo/views_caves.py +++ b/expo/views_caves.py @@ -93,4 +93,3 @@ def survey(request,year,wallet_number): elevationSketches=current_survey.scannedimage_set.filter(contents='elevation')
return render_response(request,'survey.html', locals())
-
diff --git a/expo/views_other.py b/expo/views_other.py index 8f3af0d..4cbf786 100644 --- a/expo/views_other.py +++ b/expo/views_other.py @@ -60,17 +60,20 @@ def calendar(request,year): return render_response(request,'calendar.html', locals())
def controlPanel(request):
- message = "no test message" #reverse('personn', kwargs={"name":"hkjhjh"})
+ jobs_completed=[]
if request.method=='POST':
if request.user.is_superuser:
- for item in request.POST:
- if item!='item':
+ importlist=['import_people', 'import_cavetab', 'import_logbooks', 'import_surveys', 'import_QMs']
+ databaseReset.make_dirs()
+ for item in importlist:
+ if item in request.POST:
print "running"+ " databaseReset."+item+"()"
exec "databaseReset."+item+"()"
+ jobs_completed.append(item)
else:
return HttpResponseRedirect(reverse('auth_login'))
- return render_response(request,'controlPanel.html', {'caves':Cave.objects.all()} )
+ return render_response(request,'controlPanel.html', {'caves':Cave.objects.all(),'jobs_completed':jobs_completed})
def downloadCavetab(request):
from export import tocavetab
@@ -98,4 +101,9 @@ def downloadQMs(request): response = HttpResponse(mimetype='text/csv')
response['Content-Disposition'] = 'attachment; filename=qm.csv'
toqms.writeQmTable(response,cave)
- return response
\ No newline at end of file + return response
+
+def ajax_test(request):
+ post_text = request.POST['post_data']
+ return HttpResponse("{'response_text': '"+post_text+" recieved.'}",
+ mimetype="application/json")
\ No newline at end of file |