diff options
Diffstat (limited to 'core/views/caves.py')
| -rw-r--r-- | core/views/caves.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/core/views/caves.py b/core/views/caves.py index c8ee7e8..5415302 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -359,16 +359,15 @@ def edit_cave(request, slug=None): for ceinst in ceinsts: ceinst.cave = cave ceinst.save() - cave.writeDataFile() - # try: - # cave.writeDataFile() - # except PermissionError: - # message = f'CANNOT save this file.\nPERMISSIONS incorrectly set on server for this file {cave.filename}. Ask a nerd to fix this.' - # return render(request,'errors/generic.html', {'message': message}) - # leave other exeptions unhandled so that they bubble up to userinterface - # except: - # message = f'CANNOT git on server for this file {cave.filename}. Edits not saved.\nAsk a nerd to fix this.' - # return render(request,'errors/generic.html', {'message': message}) + try: + cave.writeDataFile() + # leave other exceptions unhandled so that they bubble up to user interface + except PermissionError: + message = f'CANNOT save this file.\nPERMISSIONS incorrectly set on server for this file {cave.filename}. Ask a nerd to fix this.' + return render(request,'errors/generic.html', {'message': message}) + except SubprocessError: + message = f'CANNOT git on server for this file {cave.filename}. Edits may not be committed.\nAsk a nerd to fix this.' + return render(request,'errors/generic.html', {'message': message}) return HttpResponseRedirect("/" + cave.url) else: @@ -432,11 +431,12 @@ def edit_entrance(request, caveslug=None, slug=None): el.save() try: entrance.writeDataFile() + # leave other exceptions unhandled so that they bubble up to user interface except PermissionError: message = f'CANNOT save this file.\nPERMISSIONS incorrectly set on server for this file {entrance.filename}. Ask a nerd to fix this.' return render(request,'errors/generic.html', {'message': message}) - except: - message = f'CANNOT git on server for this file {entrance.filename}. Edits not saved.\nAsk a nerd to fix this.' + except SubprocessError: + message = f'CANNOT git on server for this file {entrance.filename}. Edits may not be committed.\nAsk a nerd to fix this.' return render(request,'errors/generic.html', {'message': message}) return HttpResponseRedirect("/" + cave.url) |