Robert Vogel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394036 )
Change subject: BlueSpiceReaders: Change config
......................................................................
BlueSpiceReaders: Change config
Added config-data in extension.json.
Removed BsConfig::registerVar-methods in main-class.
Added config-classes.
Removed old config registration.
Updated config-get methods.
Changed manifest-version to version 2.
Corrected namespac on config-classes.
Removed config "ReadersActive".
Corrected configDefinition-path
Change-Id: Ib94fb1a9dd9819129081086bda8c6e0db4828a44
---
M Readers.class.php
M extension.json
A src/ConfigDefinition/ReadersNumOfReaders.php
3 files changed, 32 insertions(+), 10 deletions(-)
Approvals:
Pwirth: Looks good to me, approved
Robert Vogel: Verified
diff --git a/Readers.class.php b/Readers.class.php
index c12be0f..2d95949 100644
--- a/Readers.class.php
+++ b/Readers.class.php
@@ -42,9 +42,6 @@
$this->mCore->registerPermission( 'viewreaders', array(),
array( 'type' => 'global' ) );
- BsConfig::registerVar( 'MW::Readers::Active', true,
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-readers-pref-active', 'toggle'
);
- BsConfig::registerVar( 'MW::Readers::NumOfReaders', 10,
BsConfig::TYPE_INT|BsConfig::LEVEL_PUBLIC, 'bs-readers-pref-numofreaders',
'int' );
-
wfProfileOut( 'BS::'.__METHOD__ );
}
@@ -189,6 +186,7 @@
private function getReadersViewForAfterContent( $oTitle ) {
$oViewReaders = null;
$oDbr = wfGetDB( DB_REPLICA );
+ $config =
\MediaWiki\MediaWikiServices::getInstance()->getConfigFactory()->makeConfig(
'bsg' );
$res = $oDbr->select(
array( 'bs_readers' ),
array( 'readers_user_id', 'MAX(readers_ts) as
readers_ts' ),
@@ -197,7 +195,7 @@
array(
'GROUP BY' => 'readers_user_id',
'ORDER BY' => 'MAX(readers_ts) DESC',
- 'LIMIT' => BsConfig::get(
'MW::Readers::NumOfReaders' )
+ 'LIMIT' => $config->get(
'ReadersNumOfReaders' )
)
);
@@ -224,8 +222,6 @@
$oUser = $this->getUser();
if ( wfReadOnly() ) return false;
-
- if ( BsConfig::get( 'MW::Readers::Active' ) == false ) return
false;
if ( is_null( $oTitle ) ) return false;
diff --git a/extension.json b/extension.json
index 6d3eb95..a56f55c 100644
--- a/extension.json
+++ b/extension.json
@@ -9,10 +9,17 @@
],
"descriptionmsg": "bs-readers-desc",
"type": "bluespice",
- "bsgExtensions": {
- "BlueSpiceReaders": {
- "className": "Readers",
- "extPath": "/BlueSpiceReaders"
+ "attributes": {
+ "BlueSpiceFoundation": {
+ "Extensions": {
+ "BlueSpiceReaders": {
+ "className": "Readers",
+ "extPath": "/BlueSpiceReaders",
+ "configDefinition": {
+ "ReadersNumOfReaders":
"\\BlueSpice\\Readers\\ConfigDefinition\\ReadersNumOfReaders::getInstance"
+ }
+ }
+ }
}
},
"SpecialPages": {
@@ -30,6 +37,14 @@
"ExtensionMessagesFiles": {
"ReadersAlias": "languages/SpecialReaders.alias.php"
},
+ "config-prefix": "bsg",
+ "config": {
+ "ReadersNumOfReaders": {
+ "value": 10,
+ "descriptionmsg": "bs-readers-pref-numofreaders",
+ "public": true
+ }
+ },
"AutoloadClasses": {
"Readers": "Readers.class.php",
"ViewReaders": "views/view.Readers.php",
diff --git a/src/ConfigDefinition/ReadersNumOfReaders.php
b/src/ConfigDefinition/ReadersNumOfReaders.php
new file mode 100644
index 0000000..69e6a40
--- /dev/null
+++ b/src/ConfigDefinition/ReadersNumOfReaders.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace BlueSpice\Readers\ConfigDefinition;
+
+use BlueSpice\ConfigDefinition\IntSetting;
+
+class ReadersNumOfReaders extends IntSetting {
+ public function getLabelMessageKey() {
+ return 'bs-readers-pref-numofreaders';
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/394036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib94fb1a9dd9819129081086bda8c6e0db4828a44
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/BlueSpiceReaders
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
