From 3fd036f6451767287f38331da04300a52f1aaff5 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Mon, 26 Jul 2021 19:30:32 +0200 Subject: [PATCH] migration gruppen start --- adm/templates/adm/adm_import_flow.html | 35 ++++++++++++++++++++++++++ adm/views.py | 4 +++ api/urls.py | 6 +++++ api/views.py | 20 ++++++++++++++- users/models.py | 1 + 5 files changed, 65 insertions(+), 1 deletion(-) diff --git a/adm/templates/adm/adm_import_flow.html b/adm/templates/adm/adm_import_flow.html index 6f5082b..a41cb9b 100644 --- a/adm/templates/adm/adm_import_flow.html +++ b/adm/templates/adm/adm_import_flow.html @@ -5,5 +5,40 @@

Agenturimport der Agentur {{agency.name}}

Die Seite nicht verlassen oder neu laden!
+
+
Gruppen anlegen...
+
+
+ {% endblock content %} \ No newline at end of file diff --git a/adm/views.py b/adm/views.py index 2ee00d6..09bc41b 100644 --- a/adm/views.py +++ b/adm/views.py @@ -713,4 +713,8 @@ class AdmImportFlow(TemplateView): ag_groups.append(g) context.update({'groups' : ag_groups}) + # LINK TO THE NC-INSTANCE + context.update({'nclink' : settings.NEXTCLOUD_URL}) + context.update({'ncid' : self.request.COOKIES['nc_session_id']}) + context.update({'nccs' : self.request.COOKIES['csrftoken']}) return context diff --git a/api/urls.py b/api/urls.py index 8d4a954..ba2b66b 100644 --- a/api/urls.py +++ b/api/urls.py @@ -11,8 +11,14 @@ urlpatterns = [ path('getchatrooms/', views.getchatrooms, name='api-getchatrooms'), path('getsinglechat/', views.getsinglechat, name='api-getsinglechat'), path('chatnewmessage/', views.savenewchatmessage, name='api-savechatmessage'), + # MIGRATION path('migrateagencyusers/', views.migrateAgencyUsers, name="api-migrateagencyusers"), + path('addgroup/', views.NCAddGroup, name="apiaddgroup"), + + + + # EXTERNAL FROM NC path('logout/', views.apilogout, name="api-logout"), path('uschanged//', views.userChangedInNc, name="api-userchanged"), diff --git a/api/views.py b/api/views.py index b69883d..9b691a9 100644 --- a/api/views.py +++ b/api/views.py @@ -121,4 +121,22 @@ def userChangedInNc(request, uid, sid): user.last_name = new_last_name user.save() return JsonResponse({"status" : "ok!"}) - return JsonResponse({"status" : "NO AUTH"}) \ No newline at end of file + return JsonResponse({"status" : "NO AUTH"}) + +from requests.auth import HTTPBasicAuth + +@api_view(['POST'], ) +def NCAddGroup(request): + if request.method == "POST": + + data = { + "groupid": "Unsere Spatengruppe" + } + headers = { + 'Accept' : 'application/json', + 'Access-Control-Allow-Headers' : 'OCS-APIRequest', + 'OCS-APIRequest' : 'true' + } + r = requests.post(settings.NEXTCLOUD_URL + "ocs/v1.php/cloud/groups", data=data, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) + print(r.text) + return JsonResponse({"status" : "NO AUTH"}) diff --git a/users/models.py b/users/models.py index 238b1f3..ea09a9d 100644 --- a/users/models.py +++ b/users/models.py @@ -480,6 +480,7 @@ class AgencyGroup(models.Model): group = models.OneToOneField(Group, on_delete=models.CASCADE) agency = models.ForeignKey(Agency, on_delete=models.CASCADE) agencygroupname = models.CharField(max_length=60, blank=True) + nc_name = models.CharField(max_length=200, blank=True) savefordel = models.BooleanField(default=False) is_admin = models.BooleanField(default=False)