Robert Vogel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393763 )
Change subject: BlueSpicePermissionManager: Change config
......................................................................
BlueSpicePermissionManager: Change config
Added config-data in extension.json.
Removed BsConfig::registerVar-methods in main-class.
Added config-class.
Removed old config registration
Removed unused code.
Removed PermissionManagerRealityCheck.php
Added config-definition.
Set return-value of 'isStored' to 'true'.
Removed isStored-method.
Updated to manifest version 2.
Fixed namespace on config-class.
Change-Id: If4378466db1aa457ce3dda0c448465ff90d79bb4
---
M PermissionManager.class.php
M extension.json
A src/ConfigDefinition/PermissionManagerMaxBackups.php
3 files changed, 33 insertions(+), 9 deletions(-)
Approvals:
Pwirth: Verified; Looks good to me, approved
diff --git a/PermissionManager.class.php b/PermissionManager.class.php
index d603933..c1a17bb 100644
--- a/PermissionManager.class.php
+++ b/PermissionManager.class.php
@@ -104,9 +104,6 @@
}
protected function initExt() {
- BsConfig::registerVar( 'MW::PermissionManager::RealityCheck',
false, BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_BOOL |
BsConfig::RENDER_AS_JAVASCRIPT, 'bs-permissionmanager-pref-enablerealitycheck',
'toggle' );
- BsConfig::registerVar( 'MW::PermissionManager::MaxBackups', 5,
BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_INT,
'bs-permissionmanager-pref-max-backups' );
-
$this->setHook( 'BSGroupManagerGroupNameChanged' );
$this->setHook( 'BSGroupManagerGroupDeleted' );
@@ -613,8 +610,9 @@
return ( strpos( $elem, "pm-settings-backup-" ) !==
FALSE ) ? true : false;
} );
+ $config =
\MediaWiki\MediaWikiServices::getInstance()->getConfigFactory()->makeConfig(
'bsg' );
//default limit to 5 backups, remove all backup files until
"maxbackups" files left
- while ( count( $arrBackupFiles ) > BsConfig::get(
"MW::PermissionManager::MaxBackups" ) ) {
+ while ( count( $arrBackupFiles ) > $config->get(
"PermissionManagerMaxBackups" ) ) {
$oldBackupFile = dirname( $bsgConfigFiles[
'PermissionManager' ] ) . "/" . array_shift( $arrBackupFiles );
unlink( $oldBackupFile );
}
diff --git a/extension.json b/extension.json
index 22e19ba..676accb 100644
--- a/extension.json
+++ b/extension.json
@@ -9,10 +9,17 @@
],
"descriptionmsg": "bs-permissionmanager-desc",
"type": "bluespice",
- "bsgExtensions": {
- "BlueSpicePermissionManager": {
- "className": "PermissionManager",
- "extPath": "/BlueSpicePermissionManager"
+ "attributes": {
+ "BlueSpiceFoundation": {
+ "Extensions": {
+ "BlueSpicePermissionManager": {
+ "className": "PermissionManager",
+ "extPath":
"/BlueSpicePermissionManager",
+ "configDefinitions": {
+ "PermissionManagerMaxBackups":
"\\BlueSpice\\PermissionManager\\ConfigDefinition\\PermissionManagerMaxBackups::getInstance"
+ }
+ }
+ }
}
},
"SpecialPages": {
@@ -37,6 +44,14 @@
},
"ExtensionMessagesFiles": {
"PermissionManagerAlias":
"includes/specials/SpecialPermissionManager.alias.php"
+ },
+ "config_prefix": "bsg",
+ "config": {
+ "PermissionManagerMaxBackups": {
+ "value": 5,
+ "descriptionmsg":
"bs-permissionmanager-pref-max-backups",
+ "public": true
+ }
},
"AutoloadClasses": {
"PermissionManager": "PermissionManager.class.php",
@@ -99,5 +114,5 @@
},
"callback": "PermissionManagerHooks::onCallback",
"load_composer_autoloader": true,
- "manifest_version": 1
+ "manifest_version": 2
}
diff --git a/src/ConfigDefinition/PermissionManagerMaxBackups.php
b/src/ConfigDefinition/PermissionManagerMaxBackups.php
new file mode 100644
index 0000000..2b61f5a
--- /dev/null
+++ b/src/ConfigDefinition/PermissionManagerMaxBackups.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace BlueSpice\PermissionManager\ConfigDefinition;
+
+use BlueSpice\ConfigDefinition\IntSetting;
+
+class PermissionManagerMaxBackups extends IntSetting {
+ public function getLabelMessageKey() {
+ return 'bs-permissionmanager-pref-max-backups';
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/393763
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4378466db1aa457ce3dda0c448465ff90d79bb4
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/BlueSpicePermissionManager
Gerrit-Branch: master
Gerrit-Owner: Pmiguelpirzer <[email protected]>
Gerrit-Reviewer: Ljonka <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pwirth <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
