forked from expo/troggle
catch unknown scotsman error
This commit is contained in:
@@ -134,14 +134,12 @@ def ajax_QM_number(request):
|
||||
|
||||
return HttpResponse(res)
|
||||
|
||||
|
||||
#print(" - newFile() is next in troggle/core/views/other.py")
|
||||
|
||||
@login_required_if_public
|
||||
def newFile(request, pslug = None):
|
||||
''' not known quite what this was for or where it fits in - original 2006 troggle idea never finished?
|
||||
'''
|
||||
if pslug:
|
||||
previousfile = LogbookEntry.objects.get(slug = pslug, date = previousdate, expedition = expedition)
|
||||
#assert previousfile.filename
|
||||
if request.method == 'POST': # If the form has been submitted...
|
||||
tripForm = TripForm(request.POST) # A form bound to the POST data
|
||||
personTripFormSet = PersonTripFormSet(request.POST)
|
||||
@@ -175,16 +173,4 @@ def newFile(request, pslug = None):
|
||||
|
||||
return render(request, 'editfile.html', {'fileForm': fileform, })
|
||||
|
||||
@login_required_if_public
|
||||
def deleteFile(request, expeditionyear, date = None, slug = None):
|
||||
expedition = Expedition.objects.get(year=expeditionyear)
|
||||
previousdate = datetime.date(*[int(x) for x in date.split("-")])
|
||||
previouslbe = LogbookEntry.objects.get(slug = slug, date = previousdate, expedition = expedition)
|
||||
delLogbookEntry(previouslbe)
|
||||
return HttpResponseRedirect(reverse('expedition', args=[expedition.year])) # Redirect after POST
|
||||
|
||||
def delFile(f):
|
||||
for pt in lbe.persontrip_set.all():
|
||||
pt.delete()
|
||||
lbe.delete()
|
||||
os.remove(lbe.filename)
|
||||
|
||||
Reference in New Issue
Block a user