Skip to content

fix: Enterprise settings disabled in Admin > Settings despite a license with required modules being present #35790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 7 commits into from
Apr 17, 2025
Merged

fix: Enterprise settings disabled in Admin > Settings despite a license with required modules being present #35790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
edf598b
Add modules property to missing settings
gabriellsh Apr 11, 2025
3b9727f
Add cs
gabriellsh Apr 11, 2025
9753d0b
Merge remote-tracking branch 'origin/develop' into fix/disabledEnterp…
gabriellsh Apr 16, 2025
0d2c849
Merge branch 'develop' into fix/disabledEnterpriseSettings
gabriellsh Apr 16, 2025
f280a1c
Merge branch 'develop' into fix/disabledEnterpriseSettings
kodiakhq[bot] Apr 17, 2025
fdb8bc3
Merge branch 'develop' into fix/disabledEnterpriseSettings
kodiakhq[bot] Apr 17, 2025
fbfe2c9
Merge branch 'develop' into fix/disabledEnterpriseSettings
gabriellsh Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/afraid-boxes-destroy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/core-typings": patch
---

Fixes an issue in `Admin > Settings` page where sometimes settings guarded by a license module would not be editable despite having the required modules.
1 change: 1 addition & 0 deletions apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ export class RocketChatSettingsAdapter {
i18nLabel: 'Federation_Matrix_max_size_of_public_rooms_users',
i18nDescription: 'Federation_Matrix_max_size_of_public_rooms_users_desc',
alert: 'Federation_Matrix_max_size_of_public_rooms_users_Alert',
modules: ['federation'],
public: true,
enterprise: true,
invalidValue: false,
Expand Down
1 change: 1 addition & 0 deletions apps/meteor/server/settings/layout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ export const createLayoutSettings = () =>
invalidValue: false,
enterprise: true,
public: true,
modules: ['hide-watermark'],
enableQuery: [
{
_id: 'Layout_Home_Body',
Expand Down
Loading