Merge pull request #104 from snikket-im/feature/enable-restricted-users

admin: Show restricted user role in the UI
admin: Inline restricted user role name
2021-11-09 17:03:08 +00:00 · 2021-11-09 17:00:59 +00:00 · 2021-11-09 16:40:50 +00:00 · 2021-11-09 10:48:18 +00:00 · 2021-11-08 18:07:34 +01:00 · 2021-10-15 14:32:57 +01:00
2 changed files with 2 additions and 6 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,5 @@ hsluv~=0.0.2
 flask-babel~=1.0
 email-validator~=1.1
 environ-config~=20.0
 wtforms~=2.3
 typing-extensions
--- a/snikket_web/admin.py
+++ b/snikket_web/admin.py
@@ -63,9 +63,6 @@ async def users() -> str:
    )
 _LIMITED_ROLE_NAME = _("Limited")
 class EditUserForm(BaseForm):
    localpart = wtforms.StringField(
        _l("Login name"),
@@ -78,9 +75,7 @@ class EditUserForm(BaseForm):
    role = wtforms.RadioField(
        _l("Access Level"),
        choices=[
-            # NOTE: enable this only after something has been done which
+            ("prosody:restricted", _("Limited")),
            # actually enforces the described restrictions :).
            # ("prosody:restricted", _LIMITED_ROLE_NAME),
            ("prosody:normal", _l("Normal user")),
            ("prosody:admin", _l("Administrator")),
        ],
Author	SHA1	Message	Date
Matthew Wild	98e7de3166	Merge pull request #104 from snikket-im/feature/enable-restricted-users admin: Show restricted user role in the UI	2021-11-09 17:03:08 +00:00
Matthew Wild	61c71b2145	admin: Inline restricted user role name It was a variable only for the benefit of translators while disabled.	2021-11-09 17:00:59 +00:00
Matthew Wild	6b35e9a259	admin: Show restricted user role in the UI	2021-11-09 16:40:50 +00:00
Matthew Wild	58c2112fec	Merge pull request #102 from snikket-im/feature/pin-wtforms Pin wtforms to 2.x	2021-11-09 10:48:18 +00:00
Jonas Schäfer	c856afee82	Pin wtforms to 2.x wtforms 3.0 is incompatible with our code. A separate issue will be filed to address the incompatibilities, but this should be enough to get working images out of it. With 3.x, we're seeing: ``` File "/home/horazont/Projects/python/snikket-web-portal/snikket_web/main.py", line 35, in LoginForm address = wtforms.TextField( AttributeError: module 'wtforms' has no attribute 'TextField' ``` and the portal fails to start.	2021-11-08 18:07:34 +01:00
Matthew Wild	c8356a8e9e	Merge pull request #101 from snikket-im/feature/https-qr Force invite QR code to HTTPS	2021-10-15 14:32:57 +01:00