bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add etherpad group as setting

Browse Source
This commit is contained in:
Patrick Mayr
2021-05-26 21:19:02 +00:00
parent bc2b06b7cc
commit e80f9b3d98
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fet2020/documents/api.py
View File

@@ -35,7 +35,11 @@ def get_ep_client(groupName="fet"):
base_url=urllib.parse.urljoin(settings.ETHERPAD_CLIENT["url"], "api"), base_url=urllib.parse.urljoin(settings.ETHERPAD_CLIENT["url"], "api"),
api_version="1.2.14", 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 return epc, group

3
fet2020/fet2020/settings.py
View File

@@ -13,6 +13,7 @@ env = environ.Env(
HOST_NAME=(str, "localhost"), HOST_NAME=(str, "localhost"),
ETHERPAD_PORT=(str, "9001"), ETHERPAD_PORT=(str, "9001"),
ETHERPAD_HOST=(str, ""), ETHERPAD_HOST=(str, ""),
ETHERPAD_GROUP=(str, ""),
) )
# Prints and logs are written to console # Prints and logs are written to console
@@ -239,12 +240,14 @@ if DEBUG:
"url": "http://etherpad:" + env("ETHERPAD_PORT"), "url": "http://etherpad:" + env("ETHERPAD_PORT"),
"exturl": ETHERPAD_HOST, "exturl": ETHERPAD_HOST,
"apikey": "/srv/etherpad/APIKEY.txt", "apikey": "/srv/etherpad/APIKEY.txt",
"group": env("ETHERPAD_GROUP"),
} }
else: else:
ETHERPAD_CLIENT = { ETHERPAD_CLIENT = {
"url": "http://etherpad:" + env("ETHERPAD_PORT"), "url": "http://etherpad:" + env("ETHERPAD_PORT"),
"exturl": urljoin("https://" + env("HOST_NAME"), "etherpad/"), "exturl": urljoin("https://" + env("HOST_NAME"), "etherpad/"),
"apikey": "/app/etherpad/APIKEY.txt", "apikey": "/app/etherpad/APIKEY.txt",
"group": env("ETHERPAD_GROUP"),
} }
# REST FRAMEWORK # REST FRAMEWORK