jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404656 )
Change subject: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and
......................................................................
WikiAdmin is not part of BlueSpice 3. Removed unneeded code and
used new registry for admin tools
Change-Id: Ie539694bb80601146c8383b1cb2cac46233b0fa8
---
M extension.json
A src/AdminTool.php
M src/Setup.php
3 files changed, 44 insertions(+), 37 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 63ec8e8..cb5f51a 100644
--- a/extension.json
+++ b/extension.json
@@ -18,6 +18,9 @@
"BlueSpiceExtendedSearchAdminAlias":
"languages/BSSearchAdmin.alias.php",
"BlueSpiceExtendedSearchCenterAlias":
"languages/BSSearchCenter.alias.php"
},
+ "BlueSpiceFoundationAdminToolRegistry": {
+ "bs-extended-search": "BS\\ExtendedSearch\\AdminTool"
+ },
"ConfigRegistry": {
"bsgES": "BS\\ExtendedSearch\\Setup::makeConfig"
},
@@ -26,8 +29,7 @@
],
"Hooks": {
"UnitTestsList": "BS\\ExtendedSearch\\Setup::onUnitTestsList",
- "ResourceLoaderTestModules":
"BS\\ExtendedSearch\\Setup::onResourceLoaderTestModules",
- "BSWikiAdminMenuItems":
"BS\\ExtendedSearch\\Setup::onBSWikiAdminMenuItems"
+ "ResourceLoaderTestModules":
"BS\\ExtendedSearch\\Setup::onResourceLoaderTestModules"
},
"SpecialPages": {
"BSSearchCenter":
"BS\\ExtendedSearch\\MediaWiki\\Specials\\SearchCenter",
diff --git a/src/AdminTool.php b/src/AdminTool.php
new file mode 100644
index 0000000..34b7c2e
--- /dev/null
+++ b/src/AdminTool.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace BS\ExtendedSearch;
+
+use BlueSpice\IAdminTool;
+
+class AdminTool implements IAdminTool {
+
+ public function getURL() {
+ $tool = \SpecialPage::getTitleFor( 'BSSearchAdmin' );
+ return $tool->getLocalURL();
+ }
+
+ public function getDescription() {
+ return wfMessage( 'bssearchadmin-desc' );
+ }
+
+ public function getName() {
+ return wfMessage( 'bssearchadmin' );
+ }
+
+ public function getClasses() {
+ $classes = array(
+ 'bs-icon-magnifying-glass'
+ );
+
+ return implode( ' ', $classes );
+ }
+
+ public function getDataAttributes() {
+ }
+
+ public function getPermissions() {
+ $permissions = array(
+ 'extendedsearchadmin-viewspecialpage'
+ );
+ return $permissions;
+ }
+
+}
\ No newline at end of file
diff --git a/src/Setup.php b/src/Setup.php
index 75ffd70..b1fe2e1 100644
--- a/src/Setup.php
+++ b/src/Setup.php
@@ -27,41 +27,6 @@
foreach( $aSources as $oSource ) {
$oSource->getUpdater()->init( $GLOBALS['wgHooks'] );
}
-
- //WikiAdmin can not register a normal special page yet.
- /*
- \WikiAdmin::registerModuleClass(
'BS\ExtendedSearch\MediaWiki\Specials\SearchAdmin', array(
- 'image' =>
'/extensions/BlueSpiceExtendedSearch/resources/images/bs-btn_searchadmin.png',
- 'level' => 'wikiadmin',
- 'message' => 'bssearchadmin',
- 'iconCls' => 'bs-icon-magnifying-glass'
- ) );
- */
- }
-
- /**
- * Adds link to admin panel
- * @param array $aOutSortable
- * @param \User The user in which context the menu is rendered
- * @return boolean always true to keep hook running
- */
- public static function onBSWikiAdminMenuItems( &$aOutSortable, $oUser )
{
- if( !$oUser->isAllowed( 'extendedsearchadmin-viewspecialpage' )
) {
- return true;
- }
- $oSpecialPage = \SpecialPage::getTitleFor( 'BSSearchAdmin' );
- $sLink = \Html::element(
- 'a',
- array (
- 'id' => 'bs-admin-extenedsearch',
- 'href' => $oSpecialPage->getLocalURL(),
- 'title' => wfMessage(
'bssearchadmin-desc' )->plain(),
- 'class' => 'bs-admin-link
bs-icon-magnifying-glass'
- ),
- wfMessage( 'bssearchadmin' )->plain()
- );
- $aOutSortable[wfMessage( 'bssearchadmin' )->escaped()] = '<li>'
. $sLink . '</li>';
- return true;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/404656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie539694bb80601146c8383b1cb2cac46233b0fa8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedSearch
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt <[email protected]>
Gerrit-Reviewer: Ljonka <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pwirth <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
