xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

remove chmod attempt

Browse Source
This commit is contained in:
Philip Sargent
2021-12-30 21:13:34 +00:00
parent c0545b8777
commit b359937eab
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/views/caves.py
View File

@@ -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)