Compare commits

..

No commits in common. "066d273e104360833b3ff3285b877afeeea95dae" and "cf95aeff7aa1f303b24d48275340d1c1b042002e" have entirely different histories.

3 changed files with 2 additions and 17 deletions

View file

@ -1009,7 +1009,7 @@
{ {
"id": "tags", "id": "tags",
"title": "Tags", "title": "Tags",
"canAddAnnotations": {"member": true, "firend": true, "staff": true, "admin": true}, "canAddAnnotations": {"member": true, "staff": true, "admin": true},
"item": "Tag", "item": "Tag",
"autocomplete": true, "autocomplete": true,
"overlap": true, "overlap": true,

View file

@ -278,7 +278,6 @@ DATA_UPLOAD_MAX_MEMORY_SIZE = 32 * 1024 * 1024
#you can ignore things below this line #you can ignore things below this line
#========================================================================= #=========================================================================
LOCAL_APPS = [] LOCAL_APPS = []
LOCAL_URLPATTERNS = []
#load installation specific settings from local_settings.py #load installation specific settings from local_settings.py
try: try:
from local_settings import * from local_settings import *
@ -305,3 +304,4 @@ except NameError:
INSTALLED_APPS = tuple(list(INSTALLED_APPS) + LOCAL_APPS) INSTALLED_APPS = tuple(list(INSTALLED_APPS) + LOCAL_APPS)

View file

@ -1,6 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os import os
import importlib
from django.urls import path, re_path from django.urls import path, re_path
from oxdjango.http import HttpFileResponse from oxdjango.http import HttpFileResponse
@ -89,17 +88,3 @@ urlpatterns += [
path(r'', app.views.index), path(r'', app.views.index),
] ]
if settings.LOCAL_URLPATTERNS:
patterns = []
for pattern, fn in settings.LOCAL_URLPATTERNS:
if isinstnace(fn, 'str'):
m, f = fn.rsplit('.', 1)
try:
m = importlib.import_module(m)
except ImportError:
logger.error('failed to import urllib module: %s', fn, exc_info=True)
continue
fn = getattr(m, f)
patterns.append(re_path(pattern, fn))
urlpatterns = patterns + urlpatterns