Skip to content

Conversation

@printminion-co
Copy link
Contributor

@printminion-co printminion-co commented Oct 1, 2025

Summary

Fixes missing output of delegate-able classes omitted before du to error .

Before

Observe missing classes:

  • OCA\Settings\Settings\Admin\Mail
  • OCA\FederatedFileSharing\Settings\Admin
  • OCA\Federation\Settings\Admin
  • OCA\ShareByMail\Settings\Admin
Current delegations
===================

Section: overview
-----------------

 ------------------------- -------------------------------------- --------------------- 
  Name                      SettingId                              Delegated to groups  
 ------------------------- -------------------------------------- --------------------- 
  Security & setup checks   OCA\Settings\Settings\Admin\Overview                        
 ------------------------- -------------------------------------- --------------------- 

Section: server
---------------

 ----------------- ------------------------------------ --------------------- 
  Name              SettingId                            Delegated to groups  
 ----------------- ------------------------------------ --------------------- 
  Background jobs   OCA\Settings\Settings\Admin\Server                        
 ----------------- ------------------------------------ --------------------- 

Section: sharing
----------------

 -------- ------------------------------------- --------------------- 
  Name     SettingId                             Delegated to groups  
 -------- ------------------------------------- --------------------- 
  Global   OCA\Settings\Settings\Admin\Sharing                        
 -------- ------------------------------------- --------------------- 

Section: theming
----------------

 -------- ---------------------------- --------------------- 
  Name     SettingId                    Delegated to groups  
 -------- ---------------------------- --------------------- 
  Global   OCA\Theming\Settings\Admin                        
 -------- ---------------------------- --------------------- 

Section: ai
-----------

 ------------------------- ---------------------------------------------------- --------------------- 
  Name                      SettingId                                            Delegated to groups  
 ------------------------- ---------------------------------------------------- --------------------- 
  Artificial Intelligence   OCA\Settings\Settings\Admin\ArtificialIntelligence                        
 ------------------------- ---------------------------------------------------- --------------------- 

After

Current delegations
===================

Section: overview
-----------------

 ------------------------- -------------------------------------- --------------------- 
  Name                      SettingId                              Delegated to groups  
 ------------------------- -------------------------------------- --------------------- 
  Security & setup checks   OCA\Settings\Settings\Admin\Overview                        
 ------------------------- -------------------------------------- --------------------- 

Section: server
---------------

 ----------------- ------------------------------------ --------------------- 
  Name              SettingId                            Delegated to groups  
 ----------------- ------------------------------------ --------------------- 
  Background jobs   OCA\Settings\Settings\Admin\Server                        
  Email server      OCA\Settings\Settings\Admin\Mail                          
 ----------------- ------------------------------------ --------------------- 

Section: sharing
----------------

 ------------------------- ----------------------------------------- --------------------- 
  Name                      SettingId                                 Delegated to groups  
 ------------------------- ----------------------------------------- --------------------- 
  Global                    OCA\Settings\Settings\Admin\Sharing                            
  Federated Cloud Sharing   OCA\FederatedFileSharing\Settings\Admin                        
  Trusted servers           OCA\Federation\Settings\Admin                                  
  Share by mail             OCA\ShareByMail\Settings\Admin                                 
 ------------------------- ----------------------------------------- --------------------- 

Section: theming
----------------

 -------- ---------------------------- --------------------- 
  Name     SettingId                    Delegated to groups  
 -------- ---------------------------- --------------------- 
  Global   OCA\Theming\Settings\Admin                        
 -------- ---------------------------- --------------------- 

Section: ai
-----------

 ------------------------- ---------------------------------------------------- --------------------- 
  Name                      SettingId                                            Delegated to groups  
 ------------------------- ---------------------------------------------------- --------------------- 
  Artificial Intelligence   OCA\Settings\Settings\Admin\ArtificialIntelligence                        
 ------------------------- ---------------------------------------------------- --------------------- 

Test JSON output with priority values

Run before fix:

php occ admin-delegation:show --output=json_pretty
[
    {
        "id": "overview",
        "name": "Overview",
        "settings": [
            {
                "name": "Security & setup checks",
                "className": "OCA\\Settings\\Settings\\Admin\\Overview",
                "delegatedGroups": []
            }
        ]
    },
    {
        "id": "server",
        "name": "Basic settings",
        "settings": [
            {
                "name": "Background jobs",
                "className": "OCA\\Settings\\Settings\\Admin\\Server",
                "delegatedGroups": []
            }
        ]
    },
    {
        "id": "sharing",
        "name": "Sharing",
        "settings": [
            {
                "name": "Global",
                "className": "OCA\\Settings\\Settings\\Admin\\Sharing",
                "delegatedGroups": []
            }
        ]
    },
    {
        "id": "theming",
        "name": "Theming",
        "settings": [
            {
                "name": "Global",
                "className": "OCA\\Theming\\Settings\\Admin",
                "delegatedGroups": []
            }
        ]
    },
    {
        "id": "ai",
        "name": "Assistant",
        "settings": [
            {
                "name": "Artificial Intelligence",
                "className": "OCA\\Settings\\Settings\\Admin\\ArtificialIntelligence",
                "delegatedGroups": []
            }
        ]
    }
]

Result after fix:

php occ admin-delegation:show --output=json_pretty
[
    {
        "id": "overview",
        "name": "Overview",
        "settings": [
            {
                "name": "Security & setup checks",
                "className": "OCA\\Settings\\Settings\\Admin\\Overview",
                "priority": 10,
                "delegatedGroups": []
            }
        ]
    },
    {
        "id": "server",
        "name": "Basic settings",
        "settings": [
            {
                "name": "Background jobs",
                "className": "OCA\\Settings\\Settings\\Admin\\Server",
                "priority": 0,
                "delegatedGroups": []
            },
            {
                "name": "Email server",
                "className": "OCA\\Settings\\Settings\\Admin\\Mail",
                "priority": 10,
                "delegatedGroups": []
            }
        ]
    },
    {
        "id": "sharing",
        "name": "Sharing",
        "settings": [
            {
                "name": "Global",
                "className": "OCA\\Settings\\Settings\\Admin\\Sharing",
                "priority": 0,
                "delegatedGroups": []
            },
            {
                "name": "Federated Cloud Sharing",
                "className": "OCA\\FederatedFileSharing\\Settings\\Admin",
                "priority": 20,
                "delegatedGroups": []
            },
            {
                "name": "Trusted servers",
                "className": "OCA\\Federation\\Settings\\Admin",
                "priority": 30,
                "delegatedGroups": []
            },
            {
                "name": "Share by mail",
                "className": "OCA\\ShareByMail\\Settings\\Admin",
                "priority": 40,
                "delegatedGroups": []
            }
        ]
    },
    {
        "id": "theming",
        "name": "Theming",
        "settings": [
            {
                "name": "Global",
                "className": "OCA\\Theming\\Settings\\Admin",
                "priority": 5,
                "delegatedGroups": []
            }
        ]
    },
    {
        "id": "ai",
        "name": "Assistant",
        "settings": [
            {
                "name": "Artificial Intelligence",
                "className": "OCA\\Settings\\Settings\\Admin\\ArtificialIntelligence",
                "priority": 10,
                "delegatedGroups": []
            }
        ]
    }
]

Checklist

@printminion-co printminion-co requested a review from a team as a code owner October 1, 2025 10:14
@printminion-co printminion-co requested review from come-nc, salmart-dev and sorbaugh and removed request for a team October 1, 2025 10:14
in order to be able to better understand priority sorting.

php occ admin-delegation:show --output=json_pretty

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
otherwise delegation only from the first priority array ara shown

Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
@printminion-co printminion-co force-pushed the fix/admin_delegation-show-all-priority-items branch from 9ce1d37 to b0ed8b1 Compare October 1, 2025 10:33
@come-nc come-nc merged commit 8950f9f into nextcloud:master Oct 7, 2025
396 of 407 checks passed
@printminion-co printminion-co deleted the fix/admin_delegation-show-all-priority-items branch October 14, 2025 07:23
@github-actions
Copy link
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@printminion-co
Copy link
Contributor Author

/backport to stable31

@backportbot
Copy link

backportbot bot commented Oct 21, 2025

The backport to stable31 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable31
git pull origin stable31

# Create the new backport branch
git checkout -b backport/55462/stable31

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 33577b31 b0ed8b14

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/55462/stable31

Error: Failed to check for changes with origin/stable31: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@artonge artonge added this to the Nextcloud 33 milestone Oct 28, 2025
@artonge
Copy link
Contributor

artonge commented Oct 28, 2025

/backport to stable32

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants