Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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(systemtags): Provide initial state for admin restriction setting
The “Restrict tag creation and editing to administrators” switch in the SystemTags
admin settings was not reflecting the correct database value on page load.
This happened because no initial state was being provided.

Fix
This change ensures the correct initial state is set by:

- Injecting IAppConfig and IInitialState dependencies.
- Following the same initial state provisioning pattern used by other admin settings in Nextcloud.

Signed-off-by: nfebe <[email protected]>
  • Loading branch information
nfebe authored and AndyScherzinger committed Dec 3, 2025
commit 26f30677b215b77ace155cad136a7e2a58ba4dcd
12 changes: 12 additions & 0 deletions apps/systemtags/lib/Settings/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,28 @@
*/
namespace OCA\SystemTags\Settings;

use OCA\SystemTags\AppInfo\Application;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Services\IInitialState;
use OCP\IAppConfig;
use OCP\Settings\ISettings;
use OCP\Util;

class Admin implements ISettings {

public function __construct(
private IAppConfig $appConfig,
private IInitialState $initialStateService,
) {
}

/**
* @return TemplateResponse
*/
public function getForm() {
$restrictSystemTagsCreationToAdmin = $this->appConfig->getValueBool(Application::APP_ID, 'restrict_creation_to_admin', false);
$this->initialStateService->provideInitialState('restrictSystemTagsCreationToAdmin', $restrictSystemTagsCreationToAdmin);

Util::addScript('systemtags', 'admin');
return new TemplateResponse('systemtags', 'admin', [], '');
}
Expand Down
37 changes: 36 additions & 1 deletion apps/systemtags/tests/Settings/AdminTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,54 @@

use OCA\SystemTags\Settings\Admin;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Services\IInitialState;
use OCP\IAppConfig;
use Test\TestCase;

class AdminTest extends TestCase {
/** @var Admin */
private $admin;
/** @var IAppConfig|\PHPUnit\Framework\MockObject\MockObject */
private $appConfig;
/** @var IInitialState|\PHPUnit\Framework\MockObject\MockObject */
private $initialState;

protected function setUp(): void {
parent::setUp();

$this->admin = new Admin();
$this->appConfig = $this->createMock(IAppConfig::class);
$this->initialState = $this->createMock(IInitialState::class);

$this->admin = new Admin(
$this->appConfig,
$this->initialState
);
}

public function testGetForm(): void {
$this->appConfig->expects($this->once())
->method('getValueBool')
->with('systemtags', 'restrict_creation_to_admin', false)
->willReturn(false);

$this->initialState->expects($this->once())
->method('provideInitialState')
->with('restrictSystemTagsCreationToAdmin', false);

$expected = new TemplateResponse('systemtags', 'admin', [], '');
$this->assertEquals($expected, $this->admin->getForm());
}

public function testGetFormWithRestrictedCreation(): void {
$this->appConfig->expects($this->once())
->method('getValueBool')
->with('systemtags', 'restrict_creation_to_admin', false)
->willReturn(true);

$this->initialState->expects($this->once())
->method('provideInitialState')
->with('restrictSystemTagsCreationToAdmin', true);

$expected = new TemplateResponse('systemtags', 'admin', [], '');
$this->assertEquals($expected, $this->admin->getForm());
}
Expand Down
Loading