kopia lustrzana https://github.com/OpenDroneMap/WebODM
Upgraded to django 1.11.1 (fix GDALClose warning), upgraded django rest framework, django filters, breaking API changes for upgrades
rodzic
de8832be00
commit
405cc5cb20
|
@ -20,10 +20,10 @@ class ProcessingNodeSerializer(serializers.ModelSerializer):
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
|
|
||||||
class ProcessingNodeFilter(FilterSet):
|
class ProcessingNodeFilter(FilterSet):
|
||||||
has_available_options = django_filters.MethodFilter()
|
has_available_options = django_filters.CharFilter(method='filter_has_available_options')
|
||||||
|
|
||||||
# noinspection PyMethodMayBeStatic
|
# noinspection PyMethodMayBeStatic
|
||||||
def filter_has_available_options(self, queryset, value):
|
def filter_has_available_options(self, queryset, name, value):
|
||||||
if value.lower() in ['true', '1']:
|
if value.lower() in ['true', '1']:
|
||||||
return queryset.exclude(available_options=dict())
|
return queryset.exclude(available_options=dict())
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -26,5 +26,5 @@ class ProjectViewSet(viewsets.ModelViewSet):
|
||||||
"""
|
"""
|
||||||
filter_fields = ('id', 'name', 'description', 'created_at')
|
filter_fields = ('id', 'name', 'description', 'created_at')
|
||||||
serializer_class = ProjectSerializer
|
serializer_class = ProjectSerializer
|
||||||
queryset = models.Project.objects.filter(deleting=False)
|
queryset = models.Project.objects.filter(deleting=False).order_by('-created_at')
|
||||||
ordering_fields = '__all__'
|
ordering_fields = '__all__'
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
from django.contrib.contenttypes.models import ContentType
|
|
||||||
from django.contrib.auth.models import Permission
|
from django.contrib.auth.models import Permission
|
||||||
from django.contrib.auth.models import User, Group
|
from django.contrib.auth.models import User, Group
|
||||||
from django.core.exceptions import ObjectDoesNotExist
|
from django.core.exceptions import ObjectDoesNotExist
|
||||||
|
@ -6,7 +5,8 @@ from django.db.utils import ProgrammingError
|
||||||
from guardian.shortcuts import assign_perm
|
from guardian.shortcuts import assign_perm
|
||||||
|
|
||||||
from nodeodm.models import ProcessingNode
|
from nodeodm.models import ProcessingNode
|
||||||
from . import scheduler
|
# noinspection PyUnresolvedReferences
|
||||||
|
from . import scheduler, signals
|
||||||
import logging
|
import logging
|
||||||
from .models import Task
|
from .models import Task
|
||||||
from webodm import settings
|
from webodm import settings
|
||||||
|
@ -16,14 +16,14 @@ from webodm.wsgi import booted
|
||||||
def boot():
|
def boot():
|
||||||
# booted is a shared memory variable to keep track of boot status
|
# booted is a shared memory variable to keep track of boot status
|
||||||
# as multiple workers could trigger the boot sequence twice
|
# as multiple workers could trigger the boot sequence twice
|
||||||
if booted.value: return
|
if not settings.DEBUG and booted.value: return
|
||||||
|
|
||||||
booted.value = True
|
booted.value = True
|
||||||
logger = logging.getLogger('app.logger')
|
logger = logging.getLogger('app.logger')
|
||||||
logger.info("Booting...")
|
logger.info("Booting...")
|
||||||
|
|
||||||
if settings.DEBUG:
|
if settings.DEBUG:
|
||||||
logger.warning("Debug mode is ON (for development this is OK)")
|
logger.warning("Debug mode is ON (for development this is OK)")
|
||||||
|
|
||||||
# Check default group
|
# Check default group
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 6ddbe1feba77fff0901a990f6a391bc48525ba74
|
Subproject commit bfc90c9cec21a06b88ed92f202a0a79901b8962d
|
|
@ -2,7 +2,7 @@ anyjson==0.3.3
|
||||||
appdirs==1.4.0
|
appdirs==1.4.0
|
||||||
APScheduler==3.2.0
|
APScheduler==3.2.0
|
||||||
coreapi==2.0.9
|
coreapi==2.0.9
|
||||||
Django==1.10.5
|
Django==1.11.1
|
||||||
django-cors-headers==2.0.2
|
django-cors-headers==2.0.2
|
||||||
django-debug-toolbar==1.6
|
django-debug-toolbar==1.6
|
||||||
django-filter==0.15.3
|
django-filter==0.15.3
|
||||||
|
|
|
@ -13,6 +13,8 @@ https://docs.djangoproject.com/en/1.10/ref/settings/
|
||||||
import os, sys
|
import os, sys
|
||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
|
import tzlocal
|
||||||
from django.contrib.messages import constants as messages
|
from django.contrib.messages import constants as messages
|
||||||
|
|
||||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
||||||
|
@ -43,6 +45,7 @@ INSTALLED_APPS = [
|
||||||
'django.contrib.messages',
|
'django.contrib.messages',
|
||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
'django.contrib.gis',
|
'django.contrib.gis',
|
||||||
|
'django_filters',
|
||||||
'guardian',
|
'guardian',
|
||||||
'rest_framework',
|
'rest_framework',
|
||||||
'rest_framework_nested',
|
'rest_framework_nested',
|
||||||
|
@ -133,7 +136,7 @@ AUTHENTICATION_BACKENDS = (
|
||||||
# https://docs.djangoproject.com/en/1.10/topics/i18n/
|
# https://docs.djangoproject.com/en/1.10/topics/i18n/
|
||||||
|
|
||||||
LANGUAGE_CODE = 'en-us'
|
LANGUAGE_CODE = 'en-us'
|
||||||
TIME_ZONE = None # Use local server time
|
TIME_ZONE = tzlocal.get_localzone().zone
|
||||||
USE_I18N = True
|
USE_I18N = True
|
||||||
USE_L10N = True
|
USE_L10N = True
|
||||||
USE_TZ = True
|
USE_TZ = True
|
||||||
|
|
Ładowanie…
Reference in New Issue