fix: groups settings visible in deepin

groups settings only show in uos (?_?) pms: Bug-293977
linuxdeepin · Dec 12, 2024 · d10ed3d · d10ed3d
1 parent fd3c2e6
commit d10ed3d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/plugin-accounts/operation/accountscontroller.cpp b/src/plugin-accounts/operation/accountscontroller.cpp
@@ -245,13 +245,26 @@ bool AccountsController::isOnline(const QString &id)
     return user ? user->online() : false;
 }
 
+bool AccountsController::needShowGroups()
+{
+#ifdef QT_DEBUG
+    // alwayls show groups for test
+    return true;
+#endif
+
+    return !DSysInfo::isCommunityEdition();
+}
+
 QStringList AccountsController::allGroups() const
 {
     return m_model->getAllGroups();
 }
 
 QStringList AccountsController::groups(const QString &id)
 {
+    if (!needShowGroups())
+        return QStringList();
+
     if (m_groups.contains(id))
         return m_groups.value(id);
 

diff --git a/src/plugin-accounts/operation/accountscontroller.h b/src/plugin-accounts/operation/accountscontroller.h
@@ -50,6 +50,7 @@ public slots:
     bool nopasswdLogin(const QString &id);
     void setNopasswdLogin(const QString &id, const bool enable);
     bool isOnline(const QString &id);
+    bool needShowGroups();
 
     QStringList allGroups() const;
     QStringList groups(const QString &id);

diff --git a/src/plugin-accounts/qml/AccountSettings.qml b/src/plugin-accounts/qml/AccountSettings.qml
@@ -433,7 +433,7 @@ DccObject {
         pageType: DccObject.Item
         page: RowLayout {
             Button {
-                Layout.alignment: Qt.AlignLeft
+                Layout.alignment: groupSettingsBtn.visible ? Qt.AlignLeft : Qt.AlignRight
                 text: qsTr("Delete current account")
                 enabled: dccData.isDeleteAble(settings.userId)
                 Loader {
@@ -457,8 +457,10 @@ DccObject {
             }
 
             Button {
+                id: groupSettingsBtn
                 Layout.alignment: Qt.AlignRight
                 text: qsTr("Group setting")
+                visible: dccData.needShowGroups()
                 onClicked: {
                     DccApp.showPage(groupSettings)
                 }