Skip to content

[stable31] ignore missing theming app #52135

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
ArtificialOwl merged 1 commit into from
Apr 12, 2025
Merged

[stable31] ignore missing theming app #52135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fix(setup): ignore missing theming app 
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
@ArtificialOwl @susnux
ArtificialOwl authored and susnux committed Apr 12, 2025
commit 46a3b18dd1c235528163fb67d33b8cc90415ab62
8 changes: 6 additions & 2 deletions lib/private/TemplateLayout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,12 @@ public function __construct($renderAs, $appId = '') {
}

// Set body data-theme
$themesService = \OCP\Server::get(\OCA\Theming\Service\ThemesService::class);
$this->assign('enabledThemes', $themesService->getEnabledThemes());
try {
$themesService = \OCP\Server::get(\OCA\Theming\Service\ThemesService::class);
Copy link
Contributor

@susnux susnux Apr 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How can this class not exist? theming is force enabled - always.

Copy link
Member

@nickvergessen nickvergessen Apr 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

before installing?

Copy link
Member Author

@ArtificialOwl ArtificialOwl Apr 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems that it is not loaded during setup process

Copy link
Member

@nickvergessen nickvergessen Apr 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it testable with CI?

Copy link
Contributor

@SystemKeeper SystemKeeper Apr 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Best would be to have e2e test for web setup (and also login flow...), most basic way would be to check if the setup page does not throw a 500 (before we install NC via occ)?

docker run --rm --volume .:/var/www/html -it ghcr.io/nextcloud/continuous-integration-php8.1:latest bash -c "(php -S 0.0.0.0:80 -t /var/www/html &) && curl --retry 5 --retry-connrefused -I localhost"

} catch (\OCP\AppFramework\QueryException) {
$themesService = null;
}
$this->assign('enabledThemes', $themesService?->getEnabledThemes() ?? []);

// Send the language, locale, and direction to our layouts
$lang = \OC::$server->get(IFactory::class)->findLanguage();
Expand Down
Loading