globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

invitation: fixed default fields

Browse source
This commit is contained in:
Éloi Rivard 2021-12-08 10:00:36 +01:00
parent 489f8414c0
commit 6fa19b85a9
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
canaille/account.py
View file

@ -14,7 +14,7 @@ from flask import (
from flask_babel import gettext as _
from flask_themer import render_template
from werkzeug.datastructures import CombinedMultiDict, FileStorage
from .apputils import b64_to_obj, login_placeholder, profile_hash, obj_to_b64
from .apputils import default_fields, b64_to_obj, login_placeholder, profile_hash, obj_to_b64
from .forms import (
InvitationForm,
LoginForm,
@ -242,8 +242,7 @@ def registration(data, hash):
"groups": data[2],
}
readable_fields = set(current_app.config["ACL"]["DEFAULT"]["READ"])
writable_fields = set(current_app.config["ACL"]["DEFAULT"]["WRITE"])
readable_fields, writable_fields = default_fields()
form = profile_form(writable_fields, readable_fields)
form.process(CombinedMultiDict((request.files, request.form)) or None, data=data)

11
canaille/apputils.py
View file

@ -42,6 +42,17 @@ def login_placeholder():
return _(" or ").join(placeholders)
def default_fields():
read = set()
write = set()
for acl in current_app.config["ACL"].values():
if "filter" not in acl:
read |= set(acl.get("READ", []))
write |= set(acl.get("WRITE", []))
return read, write
def logo():
logo_url = current_app.config.get("LOGO")
if not logo_url: