From 8e81595020744b1aef9f779668bf70996eb4151a Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sun, 26 Sep 2021 19:29:46 +0200
Subject: [PATCH] =?UTF-8?q?Oprava=20formul=C3=A1=C5=99e=20na=20p=C5=99id?=
=?UTF-8?q?=C3=A1v=C3=A1n=C3=AD=20rol=C3=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Rozbil se přechodem na mo_fields.
---
mo/web/org_users.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/mo/web/org_users.py b/mo/web/org_users.py
index b549096b..daeeb08c 100644
--- a/mo/web/org_users.py
+++ b/mo/web/org_users.py
@@ -1,4 +1,4 @@
-from typing import Optional, List
+from typing import Optional, Set
from flask import render_template, g, redirect, url_for, flash, request
from flask_wtf import FlaskForm
import werkzeug.exceptions
@@ -283,13 +283,12 @@ def org_org(id: int):
form_add_role.populate_obj(new_role)
new_role.user_id = id
- new_role.place = db.get_root_place()
+ assert form_add_role.place
+ new_role.place = form_add_role.place.place or db.get_root_place()
new_role.assigned_by = g.user.user_id
ok = True
- new_role.place = form_add_role.place.place
- if not g.gatekeeper.can_set_role(new_role):
role_errors.append(f'Roli "{new_role}" nelze přidělit, není podmnožinou žádné vaší role')
ok = False
--
GitLab