From 0ebec3c35c9d1af5d8389ffe7220b7092c2d1e43 Mon Sep 17 00:00:00 2001 From: lifegpc Date: Wed, 29 May 2024 03:11:46 +0000 Subject: [PATCH] Fix bug --- lib/dialog/edit_user_page.dart | 5 +++++ lib/dialog/new_user_page.dart | 27 +++++++++++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/lib/dialog/edit_user_page.dart b/lib/dialog/edit_user_page.dart index 28af051..e414e0e 100644 --- a/lib/dialog/edit_user_page.dart +++ b/lib/dialog/edit_user_page.dart @@ -113,6 +113,11 @@ class _EditUserPage extends State { listener.tryEmit("update_user", user); } catch (e) { _log.severe("Failed to update user ${widget.uid}: $e"); + if (!_requestCancel!.isCancelled) { + setState(() { + _isRequesting = false; + }); + } } } diff --git a/lib/dialog/new_user_page.dart b/lib/dialog/new_user_page.dart index 09e383f..d8ae1ec 100644 --- a/lib/dialog/new_user_page.dart +++ b/lib/dialog/new_user_page.dart @@ -58,6 +58,11 @@ class _NewUserPage extends State { listener.tryEmit("new_user", _newUserId); } catch (e) { _log.severe("Failed to create new user: $e"); + if (!_cancel!.isCancelled) { + setState(() { + _isRequesting = false; + }); + } } } @@ -153,16 +158,18 @@ class _NewUserPage extends State { }, obscureText: !_passwordVisible, )), - _buildWithVecticalPadding(LabeledCheckbox( - value: _isAdmin, - onChanged: (b) { - if (b != null) { - setState(() { - _isAdmin = b; - }); - } - }, - label: Text(i18n.admin))), + auth.isRoot == true + ? _buildWithVecticalPadding(LabeledCheckbox( + value: _isAdmin, + onChanged: (b) { + if (b != null) { + setState(() { + _isAdmin = b; + }); + } + }, + label: Text(i18n.admin))) + : Container(), !_isAdmin ? _buildWithVecticalPadding(UserPermissionsChips( permissions: _permissions,