remove DIRECT_EDITING setting

This commit is contained in:
Laura Klünder 2017-06-13 00:13:10 +02:00
parent 2f0b7d13d6
commit 4269f64326
2 changed files with 0 additions and 9 deletions

View file

@ -1,7 +1,6 @@
from contextlib import suppress from contextlib import suppress
from functools import wraps from functools import wraps
from django.conf import settings
from django.core.exceptions import FieldDoesNotExist, PermissionDenied from django.core.exceptions import FieldDoesNotExist, PermissionDenied
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
@ -188,9 +187,6 @@ def edit(request, pk=None, model=None, level=None, space=None, on_top_of=None, e
if obj is not None and request.POST.get('delete') == '1': if obj is not None and request.POST.get('delete') == '1':
# Delete this mapitem! # Delete this mapitem!
if request.POST.get('delete_confirm') == '1': if request.POST.get('delete_confirm') == '1':
if not settings.DIRECT_EDITING:
# todo: suggest changes
raise NotImplementedError
obj.delete() obj.delete()
if model == Level: if model == Level:
if obj.on_top_of_id is not None: if obj.on_top_of_id is not None:
@ -220,10 +216,6 @@ def edit(request, pk=None, model=None, level=None, space=None, on_top_of=None, e
for slug in form.remove_redirect_slugs: for slug in form.remove_redirect_slugs:
obj.redirects.filter(slug=slug).delete() obj.redirects.filter(slug=slug).delete()
if not settings.DIRECT_EDITING:
# todo: suggest changes
raise NotImplementedError
if level is not None: if level is not None:
obj.level = level obj.level = level

View file

@ -50,7 +50,6 @@ else:
debug_fallback = "runserver" in sys.argv debug_fallback = "runserver" in sys.argv
DEBUG = config.getboolean('django', 'debug', fallback=debug_fallback) DEBUG = config.getboolean('django', 'debug', fallback=debug_fallback)
DIRECT_EDITING = config.getboolean('c3nav', 'direct_editing', fallback=DEBUG)
RENDER_SCALE = float(config.get('c3nav', 'render_scale', fallback=20.0)) RENDER_SCALE = float(config.get('c3nav', 'render_scale', fallback=20.0))
db_backend = config.get('database', 'backend', fallback='sqlite3') db_backend = config.get('database', 'backend', fallback='sqlite3')