fileupload ok

adm/templates/adm/adm_import_flow.html

@@ -10,7 +10,7 @@
         <div id="groups_process_groups"></div>
         <h5 id="user_process" style="display: none;">Es werden {{users|length}} Benutzer angelegt und in die Gruppen gepackt. Die Nutzer müssen sich dann ein neues Passwort setzen.</h5>
         <div id="user_process_user" style="display: none;"></div>
-        <h5 id="cloud_process" style="display: none;">Es werden {{files|length}} Dateien und ({{dirids|length}}) Ordner angelegt und mit Zugriffsrechten gesetzt.</h5>
+        <h5 id="cloud_process" style="display: none;">Es werden {{files|length}} Dateien und {{dirs|length}} Ordner angelegt und mit Zugriffsrechten gesetzt.</h5>
         <div id="cloud_process_main" style="display: none;">Gruppenordner wird angelegt</div>
         <div id="cloud_process_cloud" style="display: none;"></div>
     </div>
@@ -24,10 +24,10 @@
         
         $(document).ready(function(){
             // FIRST CALL GROUPS, When Groups finished User will call by Groups
-            //createAgencyGroups(groupids[0]);
+            createAgencyGroups(groupids[0]);
 
             //DEV
-            addGroupFolder();
+            //addGroupFolder();
             //addDirs(dirids[0]);
         })
 

api/views.py

@@ -178,24 +178,27 @@ def NCAddGroup(request):
 			"groupid" : newgroupid
 		}
 		r = requests.post(settings.NEXTCLOUD_URL +  "ocs/v1.php/cloud/groups", data=data, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
-		r_status = json.loads(r.text)
+		try:
-		if(r_status['ocs']['meta']['statuscode'] == 100):
+			r_status = json.loads(r.text)
-			# Group created, save new group id in Django
+			if(r_status['ocs']['meta']['statuscode'] == 100):
-			aggroup.nc_name = newgroupid
+				# Group created, save new group id in Django
-			aggroup.save()
+				aggroup.nc_name = newgroupid
+				aggroup.save()
 
-			# Group created, set display name in NC
+				# Group created, set display name in NC
-			data = {
+				data = {
-				"name": aggroup.agencygroupname,
+					"name": aggroup.agencygroupname,
-				"id" : newgroupid
+					"id" : newgroupid
-			}
+				}
-			headers = {
+				headers = {
-				'Authorization': 'Bearer ' + request.COOKIES['nc_session_id']
+					'Authorization': 'Bearer ' + request.COOKIES['nc_session_id']
-			}
+				}
-			r = requests.post(settings.NEXTCLOUD_URL +  "apps/agency/regr", data=data, headers=headers)
+				r = requests.post(settings.NEXTCLOUD_URL +  "apps/agency/regr", data=data, headers=headers)
-			return JsonResponse({'status' : True, 'message': 'Gruppe ' + aggroup.agencygroupname + ' erzeugt - ID: ' + newgroupid})
+				return JsonResponse({'status' : True, 'message': 'Gruppe ' + aggroup.agencygroupname + ' erzeugt - ID: ' + newgroupid})
-		else:
+			else:
-			return JsonResponse({'status' : True, 'message': 'Gruppe ' + aggroup.agencygroupname + ' (ID '+aggroup.group.name+') konnte nicht erzeugt werden. Bitte manuell prüfen'})		
+				return JsonResponse({'status' : True, 'message': 'Gruppe ' + aggroup.agencygroupname + ' (ID '+aggroup.group.name+') konnte nicht erzeugt werden. Bitte manuell prüfen'})
+		except:
+			return JsonResponse({'status' : True, 'message': 'Gruppe ' + aggroup.agencygroupname + ' (ID '+aggroup.group.name+') konnte nicht erzeugt werden. Bitte manuell prüfen' + r.text})
 	return JsonResponse({"status" : "NO AUTH"})
 
 
@@ -237,10 +240,13 @@ def NCAddUser(request):
 
 			# Request for adding the new User
 			r = requests.post(settings.NEXTCLOUD_URL +  "ocs/v1.php/cloud/users", data=data, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
-			r_status = json.loads(r.text)
+			try:
-			if(r_status['ocs']['meta']['statuscode'] == 100):
+				r_status = json.loads(r.text)
-				return JsonResponse({'status' : True, 'message': 'Benutzer ' + user.first_name + " " + user.last_name + ' angelegt und in die Gruppen gepackt.'})
+				if(r_status['ocs']['meta']['statuscode'] == 100):
-			else:
+					return JsonResponse({'status' : True, 'message': 'Benutzer ' + user.first_name + " " + user.last_name + ' angelegt und in die Gruppen gepackt.'})
+				else:
+					return JsonResponse({'status' : True, 'message': 'Benutzer ' + user.first_name + " " + user.last_name + ' konnte nicht angelegt werden. Bitte manuell prüfen!'})
+			except:
 				return JsonResponse({'status' : True, 'message': 'Benutzer ' + user.first_name + " " + user.last_name + ' konnte nicht angelegt werden. Bitte manuell prüfen!'})
 
 	return JsonResponse({"status" : "NO AUTH"})
@@ -299,11 +305,12 @@ def NCAddFiles(request):
 			
 		# Uplod the file!
 		final_file_path = settings.NEXTCLOUD_URL +  "remote.php/dav/files/admin/Agenturdaten_"+ str(agency.pk) + "/" + d_prestring + "/" + file_to_load.name
-		r = requests.put(final_file_path, files={file_to_load.name : file_to_load.file.path}, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
+		with open(file_to_load.file.path, 'rb') as f:
-		if(len(r.text) == 0):
+			r = requests.put(final_file_path, data=f, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
-			return JsonResponse({'status' : True, 'message': 'Datei ' + file_to_load.name + ' angelegt.'})
+			if(len(r.text) == 0):
-		else:
+				return JsonResponse({'status' : True, 'message': 'Datei ' + file_to_load.name + ' angelegt.'})
-			return JsonResponse({'status' : True, 'message': 'Datei ' + file_to_load.name + ' konnte nicht angelegt. Bitte manuell prüfen!'})
+			else:
+				return JsonResponse({'status' : True, 'message': 'Datei ' + file_to_load.name + ' konnte nicht angelegt. Bitte manuell prüfen!'})
 	
 	return JsonResponse({"status" : "NO AUTH"})
 
@@ -340,8 +347,9 @@ def NCAddDirs(request):
 				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))
 				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))
+			
 			return JsonResponse({'status' : True, 'message': 'Ordner ' + dir_to_create.name + ' angelegt.'})
 				
 

digitaleagentur/settings.py

@@ -31,7 +31,8 @@ SESSION_COOKIE_AGE = 100*60*60
 #CHANNELS_PRESENCE_MAX_AGE = 30
 
 # FOR SUMMERNOTE ORIGIN
-X_FRAME_OPTIONS = 'ALLOWALL'
+X_FRAME_OPTIONS = 'SAMEORIGIN'
+#X_FRAME_OPTIONS = 'ALLOWALL'
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/