From 304d8e8724c9a0673b8c7cf42c93fc03f3ba6606 Mon Sep 17 00:00:00 2001 From: darta Date: Sun, 6 Feb 2022 19:16:51 +0100 Subject: [PATCH] fix(admin): import csv fix groups --- admin/src/admin/lib/admin.py | 7 ++++--- admin/src/admin/views/ApiViews.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/admin/src/admin/lib/admin.py b/admin/src/admin/lib/admin.py index 377e2de..1963d66 100644 --- a/admin/src/admin/lib/admin.py +++ b/admin/src/admin/lib/admin.py @@ -842,9 +842,10 @@ class Admin: ### Create all groups. Skip / in system groups total = len(groups) + log.error(groups) ev = Events("Syncing groups from external to moodle", total=len(groups)) for g in groups: - parts = g.split(".") + parts = g.split("/") if not len(parts): log.error(" MOODLE GROUPS: Group " + g + " empty") continue @@ -934,7 +935,7 @@ class Admin: ev = Events("Syncing groups from external to nextcloud", total=len(groups)) for g in groups: - parts = g.split(".") + parts = g.split("/") if not len(parts): log.error(" NEXTCLOUD GROUPS: Group " + g + " empty") continue @@ -1516,7 +1517,7 @@ class Admin: internaluser = [u for u in self.internal["users"] if u["id"] == user_id][0] cohorts = self.moodle.get_cohorts() for group in mdelete: - cohort = [c for c in cohorts if c["name"] == group][0] + cohort = [c for c in cohorts if c["name"] == group[0]] try: self.moodle.delete_user_in_cohort( internaluser["moodle_id"], cohort["id"] diff --git a/admin/src/admin/views/ApiViews.py b/admin/src/admin/views/ApiViews.py index 0f4821a..a01c421 100644 --- a/admin/src/admin/views/ApiViews.py +++ b/admin/src/admin/views/ApiViews.py @@ -32,7 +32,7 @@ from ..lib.dashboard import Dashboard dashboard = Dashboard() - +@app.route("/sysadmin/api/resync") @app.route("/api/resync") @login_required def resync():