From 49c3521d82db5d8380cc5d4cd57ac030365edc5a Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sun, 1 Aug 2021 16:46:49 +0200 Subject: [PATCH] mist alles --- adm/templates/adm/adm_import_flow.html | 16 +++-------- adm/urls.py | 2 ++ adm/views.py | 16 +++++++++++ api/views.py | 27 +++++++++--------- .../__pycache__/settings.cpython-38.pyc | Bin 4541 -> 4565 bytes digitaleagentur/settings.py | 6 ++-- users/templates/users/login.html | 4 +-- 7 files changed, 41 insertions(+), 30 deletions(-) diff --git a/adm/templates/adm/adm_import_flow.html b/adm/templates/adm/adm_import_flow.html index 74b9efc..3370627 100644 --- a/adm/templates/adm/adm_import_flow.html +++ b/adm/templates/adm/adm_import_flow.html @@ -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]); }) @@ -101,21 +101,13 @@ $("#cloud_process").show(); $("#cloud_process_main").show(); $.ajax({ - url: "{% url 'api:apiaddgf' %}", - headers: { - 'Authorization':'Token {{ ncid }}', - "Access-Control-Allow-Origin" : "*" - }, - method: 'POST', + url: "{% url 'mig-groupfolder' agency.pk %}", dataType: 'json', - data: { - 'agencyid' : {{agency.pk}}, - }, success: function(data){ console.log(data); if(data['status'] == true){ if(files[0] != undefined){ - addFiles(files[0]); + //addFiles(files[0]); } } }, diff --git a/adm/urls.py b/adm/urls.py index 53d6453..a87296b 100644 --- a/adm/urls.py +++ b/adm/urls.py @@ -25,4 +25,6 @@ urlpatterns = [ path('wd//delete', AdmWorkdayDelete.as_view(), name="adm-workday-delete"), path('wd/break//delete', AdmBreakDelete.as_view(), name="adm-break-delete"), path('wd//break/add', AdmAddBreak.as_view(), name="adm-break-add"), + # MIGRATION + path('mig/aggroupfolder/', createAgGroupFolder, name="mig-groupfolder"), ] diff --git a/adm/views.py b/adm/views.py index 1ec7701..3e03055 100644 --- a/adm/views.py +++ b/adm/views.py @@ -726,4 +726,20 @@ class AdmImportFlow(TemplateView): # LINK TO THE NC-INSTANCE context.update({'nclink' : settings.NEXTCLOUD_URL}) context.update({'ncid' : self.request.user.profile.nc_sid}) + context.update({'nc_url' : settings.NEXTCLOUD_URL}) return context + +''' + Erstellt einen Gruppenordner +''' +def createAgGroupFolder(request, agencypk): + print("HI!") + #agency = Agency.objects.get(pk=agencypk) + #data = { + # "gid" : "agencymaingroupid_" + str(agency.pk), + # "aid" : str(agency.pk) + #} + + r = requests.get(settings.NEXTCLOUD_URL + "apps/agency/createagf", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + print(r.text) + return JsonResponse({'status' : True, 'message': 'Gruppenordner angelegt!'}) diff --git a/api/views.py b/api/views.py index 378e18c..e81c5fc 100644 --- a/api/views.py +++ b/api/views.py @@ -162,7 +162,7 @@ def create_group_id(agencygroupname, agency): ''' - Diese Methode erstellt die Gruppen in Owncloud nach dem Schemata, wie sie auch bei einer Registrierung aufgebaut werden. + Diese Methode erstellt die Gruppen in NC nach dem Schemata, wie sie auch bei einer Registrierung aufgebaut werden. ''' @api_view(['POST'], ) @@ -257,6 +257,7 @@ def NCAddUser(request): return JsonResponse({"status" : "NO AUTH"}) +from requests.auth import HTTPBasicAuth ''' Anlegen des Gruppenordners der Agentur in NC ''' @@ -266,16 +267,16 @@ def NCAddGroupFolder(request): agency = Agency.objects.get(pk=request.POST.get('agencyid')) data = { "gid" : "agencymaingroupid_" + str(agency.pk), - "aid" : str(agency.pk) + "aid" : str(agency.pk), + "sk'" : settings.NC_SECRETKEY } headers = { - 'Accept' : 'application/json', - 'Access-Control-Allow-Headers' : 'OCS-APIRequest', - 'OCS-APIRequest' : 'true' + 'Authorization': 'Bearer ' + request.COOKIES['nc_session_id'] } - r = requests.post(settings.NEXTCLOUD_URL + "apps/agency/createagf", data=data, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + r = requests.post(settings.NEXTCLOUD_URL + "apps/agency/createagf", data=data, headers=headers) print(r.text) - return JsonResponse({'status' : True, 'message': 'Gruppenordner angelegt!'}) + print(r.text) + return JsonResponse({'status' : True, 'message': 'Gruppenordner angelegt!' + r.text}) return JsonResponse({"status" : "NO AUTH"}) @@ -376,10 +377,8 @@ def NCTest(request): # Setting the Users Data for logging @api_view(['POST'], ) def SetUserData(request): - try: - user = User.objects.get(username=request.POST.get('uid')) - user.profile.nc_sid = request.POST.get('sid') - user.save() - return JsonResponse({'message' : 'A user was found in request, sid set!'}) - except: - return JsonResponse({'message' : 'No user is in this request.'}) + user = User.objects.get(username=request.POST.get('uid')) + user.profile.nc_sid = request.POST.get('sid') + user.save() + return JsonResponse({'message' : 'A user was found in request, sid set!'}) + \ No newline at end of file diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 58ba909e3e0f99017af330697676933461c9c263..7d4d7a01853ca7118c356456098c4bda53d83ff3 100644 GIT binary patch delta 414 zcmX|-$u9$O6vyW`sR@l~>tx?ryQ0)gZACX~E4o;oweqboG0H zDsx$7iiKLS^4|=xqCjm}rFN{*l@sgaf}J|d>4ZRCh*LKb)Pp4TB1L@}maVuG%Iwcn zmRN~lqn0Cg*$iad*evlhh%FlWGga6&jR!=-zt;RYf*tZ=7j~7=DE6?A0~{84bCU${ z39dJ7e6nYLn1;?yv+0xbT>4yxPtKoYV~c@cbVZi5Nam>C8FODw87d{-9 K%u(2@Is5@6mU@-| delta 394 zcmX|-IZpy%5Qg{LEE}&CsqjPvFT@-008y7qQ3Q1tkMTgviyLfAOl&lU_!Gz$HWXrE zVq&+oosB<0e}$#Bx)S0{<|&>@CX@Hw_2QB;lGMPN^>r=gZc5T!=`mc?oMeX=KKL<> z8O&l10R%CxHBc);)P@C(gB6Qdf{ZXCnowYfmIaMbJ7S0z7e*g5i4%}CyZ-3m{m*rTzUsRx;69Q!o!XU&_FIG`yU!fL+j#SyYNMy|{kSRMJm zE1dhp_+-z#@g{^sCpn_AxSUC \ No newline at end of file