diff --git a/mo/db.py b/mo/db.py index af3d60184be11bb64566afc4ea681fdb4b013209..bf4bc21bef92a25a857cf088920e911027a5e1a3 100644 --- a/mo/db.py +++ b/mo/db.py @@ -369,9 +369,14 @@ class User(Base): def name_sort_key(self) -> Tuple[str, str]: return (locale.strxfrm(self.last_name), locale.strxfrm(self.first_name)) + @property def is_inactive(self) -> bool: return self.last_login_at is None + @property + def is_system(self) -> bool: + return self.user_id == 0 + def get_system_user() -> User: """Uživatel s user_id=0 je systémový (viz db.ddl)""" diff --git a/mo/web/templates/org_orgs.html b/mo/web/templates/org_orgs.html index 7d556a2ac02c668edfe4a8007c44c9db451934ae..dab3ea76ae9e7a79b4942fb17178557660f6b8c4 100644 --- a/mo/web/templates/org_orgs.html +++ b/mo/web/templates/org_orgs.html @@ -83,7 +83,7 @@ <tr> <td>{{ user.first_name }}</td><td>{{ user.last_name }}</td> <td>{{ user.email|mailto }}{{ user|user_flags }}</td> - <td>{% if user.is_admin %}správce{% elif user.roles|count == 0 %}<i>žádná role</i>{% endif %} + <td>{% if user.is_system %}systémový uživatel{% elif user.is_admin %}správce{% elif user.roles|count == 0 %}<i>žádná role</i>{% endif %} {% if user.roles|count > 0 %} <ul> {% for role in user.roles %} diff --git a/mo/web/util.py b/mo/web/util.py index 90b9bfa9bd988a083031e7ac24f9378ddb4857b8..3c64f9472a5a6f38963fcdd4e27a674f39de45ea 100644 --- a/mo/web/util.py +++ b/mo/web/util.py @@ -136,7 +136,7 @@ def user_html_flags(u: db.User) -> Markup: r = [] if u.is_test: r.append("<span class='user-test' title='Testovací uživatel'>*</span>") - if u.is_inactive(): + if u.is_inactive: r.append("<span class='user-inactive' title='Účet dosud nebyl aktivován'>*</span>") if len(r) == 0: return Markup("")