jenkins-bot has submitted this change and it was merged.
Change subject: [Task] Expand in other languages box by default
......................................................................
[Task] Expand in other languages box by default
Bug: T92387
Change-Id: I37aed5d58dc57ce174b145fe3e7c3394d8fa1afa
---
M repo/Wikibase.hooks.php
M view/src/EntityViewPlaceholderExpander.php
2 files changed, 14 insertions(+), 10 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index eeb930d..44840c2 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -356,6 +356,7 @@
'label-message' =>
'wikibase-setting-entitytermsview-showEntitytermslistview',
'help-message' =>
'wikibase-setting-entitytermsview-showEntitytermslistview-help',
'section' => 'rendering/advancedrendering',
+ 'default' => '1',
);
} elseif ( $user->getBoolOption(
'wikibase-entitytermsview-showEntitytermslistview' ) ) {
// Clear setting after uninstalling Babel extension.
diff --git a/view/src/EntityViewPlaceholderExpander.php
b/view/src/EntityViewPlaceholderExpander.php
index 1c49f1c..dc679ef 100644
--- a/view/src/EntityViewPlaceholderExpander.php
+++ b/view/src/EntityViewPlaceholderExpander.php
@@ -211,16 +211,7 @@
isset( $args[1] ) ? (int)$args[1] : 0
);
case
'entityViewPlaceholder-entitytermsview-entitytermsforlanguagelistview-class':
- return
- !$this->user->isAnon()
- && $this->user->getBoolOption(
-
'wikibase-entitytermsview-showEntitytermslistview'
- )
- || $this->user->isAnon()
- && isset(
$_COOKIE['wikibase-entitytermsview-showEntitytermslistview'] )
- &&
$_COOKIE['wikibase-entitytermsview-showEntitytermslistview'] === 'true'
- ? '' : 'wikibase-initially-collapsed';
-
+ return $this->isInitiallyCollapsed() ?
'wikibase-initially-collapsed' : '';
default:
wfWarn( "Unknown placeholder: $name" );
return '(((' . htmlspecialchars( $name ) .
')))';
@@ -228,6 +219,18 @@
}
/**
+ * @return bool If the terms list should be initially collapsed for the
current user.
+ */
+ private function isInitiallyCollapsed() {
+ if ( $this->user->isAnon() ) {
+ return isset(
$_COOKIE['wikibase-entitytermsview-showEntitytermslistview'] )
+ &&
$_COOKIE['wikibase-entitytermsview-showEntitytermslistview'] === 'false';
+ } else {
+ return !$this->user->getBoolOption(
'wikibase-entitytermsview-showEntitytermslistview' );
+ }
+ }
+
+ /**
* Generates HTML of the term box, to be injected into the entity page.
*
* @param EntityId $entityId
--
To view, visit https://gerrit.wikimedia.org/r/265474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37aed5d58dc57ce174b145fe3e7c3394d8fa1afa
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Adrian Lang <[email protected]>
Gerrit-Reviewer: Bene <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
