From 17b321fc10dcb5e38d9a3f452e0c1bade820f482 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 16 Jan 2025 16:14:50 +0100 Subject: [PATCH] Prevent unlocking yourself as admin user --- nymea-app/ui/system/UsersSettingsPage.qml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nymea-app/ui/system/UsersSettingsPage.qml b/nymea-app/ui/system/UsersSettingsPage.qml index ee446482..3178946c 100644 --- a/nymea-app/ui/system/UsersSettingsPage.qml +++ b/nymea-app/ui/system/UsersSettingsPage.qml @@ -37,7 +37,6 @@ SettingsPageBase { popup.open() } } - } RowLayout { @@ -361,8 +360,10 @@ SettingsPageBase { Layout.fillWidth: true text: model.text checked: (userDetailsPage.userInfo.scopes & model.scope) === model.scope - enabled: model.scope === UserInfo.PermissionScopeAdmin || - ((userDetailsPage.userInfo.scopes & UserInfo.PermissionScopeAdmin) !== UserInfo.PermissionScopeAdmin) + + enabled: model.scope === UserInfo.PermissionScopeAdmin && userDetailsPage.userInfo.username == userManager.userInfo.username ? + false : model.scope === UserInfo.PermissionScopeAdmin || + ((userDetailsPage.userInfo.scopes & UserInfo.PermissionScopeAdmin) !== UserInfo.PermissionScopeAdmin) onClicked: { print("scopes:", userDetailsPage.userInfo.scopes) var scopes = userDetailsPage.userInfo.scopes @@ -465,12 +466,10 @@ SettingsPageBase { } } - SettingsPageSectionHeader { text: qsTr("Permissions") } - Repeater { id: scopesRepeater model: NymeaUtils.scopesModel