diff --git a/adm/views.py b/adm/views.py index 29ad489..0af501a 100644 --- a/adm/views.py +++ b/adm/views.py @@ -748,7 +748,7 @@ def createAgGroupFolder(request, agencypk): } r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/creategf?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data) - r_2 = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_" + str(agency.pk)+ '/Standards Uploadbereich', auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + r_2 = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_" + str(agency.pk)+ '/Standards Uploadbereich', auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) json_response = json.loads(r.text) response_status = json_response['ocs']['meta']['status'] if(response_status == "ok"): diff --git a/api/views.py b/api/views.py index 18065cf..e9035ed 100644 --- a/api/views.py +++ b/api/views.py @@ -322,11 +322,11 @@ def NCAddFiles(request): # Dirs needed for the File for d in datadir_parent_dirnames: new_folder = d_prestring + "/" +d - r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_" + str(agency.pk)+ '/' + new_folder, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_" + str(agency.pk)+ '/' + new_folder, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) d_prestring += "/" + d # Uplod the file! - final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_"+ str(agency.pk) + "/" + d_prestring + "/" + file_to_load.name + final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_"+ str(agency.pk) + "/" + d_prestring + "/" + file_to_load.name with open(file_to_load.file.path, 'rb') as f: r = requests.put(final_file_path, data=f, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) if(len(r.text) == 0): @@ -346,7 +346,7 @@ def NCAddStandardFiles(request): file_to_load = DataFile.objects.get(pk=request.GET.get('fileid')) # Uplod the file! - final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_"+ str(agency.pk) + "/Standards Uploadbereich/" + file_to_load.name + final_file_path = settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_"+ str(agency.pk) + "/Standards Uploadbereich/" + file_to_load.name with open(file_to_load.file.path, 'rb') as f: r = requests.put(final_file_path, data=f, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) @@ -373,7 +373,7 @@ def NCAddDirs(request): sharestring += cd.agencygroupname + " (" + cd.nc_name + ")" # Dir has no parent, create if(len(dir_to_create.parent.name) == 0): - r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_" + str(agency.pk)+ '/' + dir_to_create.name, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_" + str(agency.pk)+ '/' + dir_to_create.name, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) return JsonResponse({'status' : True, 'message': 'Ordner ' + dir_to_create.name + ' angelegt. ' + sharestring}) # Dir has parents, start thinking :) else: @@ -393,10 +393,10 @@ def NCAddDirs(request): d_prestring = "" for d in datadir_parent_dirnames: new_folder = d_prestring + "/" +d - r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_" + str(agency.pk)+ '/' + new_folder, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_" + str(agency.pk)+ '/' + new_folder, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) d_prestring += "/" + d - r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/admin/Agenturdaten_" + str(agency.pk)+ '/' + d_prestring + "/" + dir_to_create.name, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + r = requests.request("MKCOL", settings.NEXTCLOUD_URL + "remote.php/dav/files/vhdarootadmin_2cdme7ckw/Agenturdaten_" + str(agency.pk)+ '/' + d_prestring + "/" + dir_to_create.name, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) return JsonResponse({'status' : True, 'message': 'Ordner ' + dir_to_create.name + ' angelegt.' + sharestring}) diff --git a/standards/views.py b/standards/views.py index dc71139..dadc060 100644 --- a/standards/views.py +++ b/standards/views.py @@ -276,7 +276,7 @@ def StandardAdd(request, id=False): } nc_login_headers = {'Authorization' : 'Bearer ' + request.user.profile.nc_sid} - r = requests.request("PROPFIND", settings.NEXTCLOUD_URL + "remote.php/dav/files/" + request.user.username + "/Agenturdaten_1/", headers=nc_login_headers, data=data_nc) + r = requests.request("PROPFIND", settings.NEXTCLOUD_URL + "remote.php/dav/files/" + request.user.username + "/Agenturdaten_" + str(request.user.profile.agency.pk) + "/", headers=nc_login_headers, data=data_nc) print(r.text) #allfiles = DataFile.objects.filter(agency=request.user.profile.agency)