From 6977dc51f7e203267c67cc0bdc8fd7a012b8d754 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Mon, 18 Oct 2021 09:36:31 +0200 Subject: [PATCH] Uploaderror Large Type und Doppelt --- .../templates/standards/standards_add.html | 22 +++++--- standards/views.py | 50 +++++++++++-------- 2 files changed, 45 insertions(+), 27 deletions(-) diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html index e3f2d5f..35babec 100644 --- a/standards/templates/standards/standards_add.html +++ b/standards/templates/standards/standards_add.html @@ -164,12 +164,10 @@ - {% if user|usergperm:"filesmanager" %} - {% endif %} @@ -269,13 +267,13 @@
- +
- Diesen Dateitypen dürfen Sie nicht hochladen. + Die Datei wurde nicht hochgeladen! Bitte prüfen Sie die erlaubten Dateitypen, die maximale Dateigröße und ob die Datei im Ordner Standards Uploadbereich bereits vorhanden ist.
@@ -1240,7 +1238,7 @@ function doUploadAction(filetodo, replacestat){ processData: false, contentType: false, beforeSend: function(){ - $("#uploadModalProgress").modal("toggle"); + $("#uploadModalProgress").modal("show"); }, xhr: function() { var xhr = new window.XMLHttpRequest(); @@ -1253,7 +1251,7 @@ function doUploadAction(filetodo, replacestat){ return xhr; }, success: function(data) { - console.log(data); + if(data["success"] == true){ setTimeout(function(){ hideUpload(); @@ -1264,12 +1262,22 @@ function doUploadAction(filetodo, replacestat){ }, 1000); } else{ - $("#forbiddenFileType").modal("toggle") + setTimeout(function(){ + hideUpload(); + $("#forbiddenFileType").modal("toggle"); + }, 1000); } + }, + error: function(){ + setTimeout(function(){ + hideUpload(); + $("#forbiddenFileType").modal("toggle"); + }, 1000); } }); } else{ + hideUpload(); $("#forbiddenFileType").modal("toggle") } } diff --git a/standards/views.py b/standards/views.py index a7e6853..dc71139 100644 --- a/standards/views.py +++ b/standards/views.py @@ -825,7 +825,6 @@ def StandardChangePublic(request, pk): standard.save() return redirect('standards') -# TODO: Upload der Standard-Dateien passt noch nicht, BUG!!!! @login_required def StandardSingle(request, pk): @@ -1217,25 +1216,36 @@ def uploadFileFromStandard(request): if(file_ok): final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/" + request.user.username + "/Agenturdaten/Standards Uploadbereich/" + request.FILES['uploadedfile'].name - - r = requests.put(final_file_path, data=request.FILES['uploadedfile'], headers={'Content-Type' : 'text/xml;', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) - if(len(r.text) == 0): - try: - new_file_name = request.FILES['uploadedfile'].name - # Upload OK - get File-ID in NC - filesearchdata = '/files/' + request.user.username + 'infinity' + new_file_name + '' - r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml;', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) - #print(r.text) - split_response = r.text.split("") - new_id = split_response[1].split("")[0] - - tf = NCFile(agency=request.user.profile.agency, nc_id=new_id) - tf.save() - return JsonResponse({"success" : success, "data" : {'savedobj_id' : new_id, 'savedobj_name' : new_file_name}}) - except: - success = True - return JsonResponse({"success" : success, "data" : {'savedobj_id' : None, 'savedobj_name' : 'Datei hochgeladen, enthält aber falsche Zeichen. Bitte Seite neu laden und anschließend über Suchfeld hinzufügen.'}}) - + + # Check if File already exist + try: + new_file_name = request.FILES['uploadedfile'].name + filesearchdata = '/files/' + request.user.username + 'infinity' + new_file_name + '' + r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml;', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + #print(r.text) + split_response = r.text.split("") + new_id = split_response[1].split("")[0] + return JsonResponse({"success" : False, "data" : "file exist"}) + except: + # File will be uploaded + r = requests.put(final_file_path, data=request.FILES['uploadedfile'], headers={'Content-Type' : 'text/xml;', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + if(len(r.text) == 0): + try: + new_file_name = request.FILES['uploadedfile'].name + # Upload OK - get File-ID in NC + filesearchdata = '/files/' + request.user.username + 'infinity' + new_file_name + '' + r = requests.request("SEARCH", settings.NEXTCLOUD_URL + "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml;', 'Authorization' : "Bearer " + request.user.profile.nc_sid}) + #print(r.text) + split_response = r.text.split("") + new_id = split_response[1].split("")[0] + + tf = NCFile(agency=request.user.profile.agency, nc_id=new_id) + tf.save() + return JsonResponse({"success" : success, "data" : {'savedobj_id' : new_id, 'savedobj_name' : new_file_name}}) + except: + success = True + return JsonResponse({"success" : success, "data" : {'savedobj_id' : None, 'savedobj_name' : 'Datei hochgeladen, enthält aber falsche Zeichen. Bitte speichern Sie den Standard, laden die Seite ne und binden die Datei danach ein.'}}) + return JsonResponse({"success" : success, "data" : "DONE!"}) return JsonResponse({"success" : success, "data" : "DONE!"}) \ No newline at end of file