diff --git a/core/views/other.py b/core/views/other.py index a7dc427..8ac7f34 100644 --- a/core/views/other.py +++ b/core/views/other.py @@ -242,8 +242,8 @@ def scanupload(request, wallet=None): if request.method == 'POST': form = FilesForm(request.POST,request.FILES) if form.is_valid(): - f = request.FILES["scanfiles"] - multiple = request.FILES.getlist('scanfiles') + f = request.FILES["uploadfiles"] + multiple = request.FILES.getlist('uploadfiles') fs = FileSystemStorage(os.path.join(settings.SURVEY_SCANS, year, wallet)) actual_saved = [] @@ -307,8 +307,8 @@ def dwgupload(request, folder=None): if request.method == 'POST': form = FilesForm(request.POST,request.FILES) if form.is_valid(): - f = request.FILES["scanfiles"] - multiple = request.FILES.getlist('scanfiles') + f = request.FILES["uploadfiles"] + multiple = request.FILES.getlist('uploadfiles') fs = FileSystemStorage(os.path.join(settings.DRAWINGS_DATA, folder)) actual_saved = [] diff --git a/urls.py b/urls.py index 8e4ccfe..c3eabc6 100644 --- a/urls.py +++ b/urls.py @@ -11,7 +11,7 @@ from django.urls import reverse, resolve from troggle.core.views import caves, statistics, survex from troggle.core.views.scans import scansingle, singlewallet, allwallets from troggle.core.views.drawings import dwgallfiles, dwgfilesingle -from troggle.core.views.drawings import dwgfileupload +#from troggle.core.views.drawings import dwgfileupload from troggle.core.views.other import dwgupload from troggle.core.views.other import troggle404, frontpage, todos, controlpanel, frontpage, scanupload from troggle.core.views.other import exportlogbook