From e80f9b3d980e57c4bba57a224b34ca182133810e Mon Sep 17 00:00:00 2001 From: patrick Date: Wed, 26 May 2021 21:19:02 +0000 Subject: [PATCH] add etherpad group as setting --- fet2020/documents/api.py | 6 +++++- fet2020/fet2020/settings.py | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/fet2020/documents/api.py b/fet2020/documents/api.py index d3e4bf04..775a71cc 100644 --- a/fet2020/documents/api.py +++ b/fet2020/documents/api.py @@ -35,7 +35,11 @@ def get_ep_client(groupName="fet"): base_url=urllib.parse.urljoin(settings.ETHERPAD_CLIENT["url"], "api"), api_version="1.2.14", ) - group = epc.createGroupIfNotExistsFor(groupMapper=groupName) + + if settings.ETHERPAD_CLIENT["group"] == "": + group = epc.createGroupIfNotExistsFor(groupMapper=groupName) + else: + group = settings.ETHERPAD_CLIENT["group"] return epc, group diff --git a/fet2020/fet2020/settings.py b/fet2020/fet2020/settings.py index 24d1499c..cb6a6ca1 100644 --- a/fet2020/fet2020/settings.py +++ b/fet2020/fet2020/settings.py @@ -13,6 +13,7 @@ env = environ.Env( HOST_NAME=(str, "localhost"), ETHERPAD_PORT=(str, "9001"), ETHERPAD_HOST=(str, ""), + ETHERPAD_GROUP=(str, ""), ) # Prints and logs are written to console @@ -239,12 +240,14 @@ if DEBUG: "url": "http://etherpad:" + env("ETHERPAD_PORT"), "exturl": ETHERPAD_HOST, "apikey": "/srv/etherpad/APIKEY.txt", + "group": env("ETHERPAD_GROUP"), } else: ETHERPAD_CLIENT = { "url": "http://etherpad:" + env("ETHERPAD_PORT"), "exturl": urljoin("https://" + env("HOST_NAME"), "etherpad/"), "apikey": "/app/etherpad/APIKEY.txt", + "group": env("ETHERPAD_GROUP"), } # REST FRAMEWORK