jenkins-bot has submitted this change and it was merged. Change subject: Remove the displayStatementsOnProperties setting ......................................................................
Remove the displayStatementsOnProperties setting No real use case left, after this has been enabled on Wikidata (especially given this doesn't really prevent Statements on Properties, but rather just doesn't show them). Change-Id: I9c2f02b5eafea8068add04e973ca531c24521248 --- M repo/config/Wikibase.default.php M repo/includes/View/EntityViewFactory.php M repo/includes/View/PropertyView.php 3 files changed, 5 insertions(+), 33 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php index 8187aa1..1eb1e3d 100644 --- a/repo/config/Wikibase.default.php +++ b/repo/config/Wikibase.default.php @@ -94,8 +94,6 @@ 'useRedirectTargetColumn' => true, - 'displayStatementsOnProperties' => true, - 'conceptBaseUri' => function() { $uri = $GLOBALS['wgServer']; $uri = preg_replace( '!^//!', 'http://', $uri ); diff --git a/repo/includes/View/EntityViewFactory.php b/repo/includes/View/EntityViewFactory.php index 66e76f6..5682ab4 100644 --- a/repo/includes/View/EntityViewFactory.php +++ b/repo/includes/View/EntityViewFactory.php @@ -12,7 +12,6 @@ use Wikibase\Lib\Store\EntityLookup; use Wikibase\Lib\Store\EntityTitleLookup; use Wikibase\Lib\Store\LabelLookup; -use Wikibase\Repo\WikibaseRepo; /** * @since 0.5 @@ -87,10 +86,7 @@ if ( $entityType === 'item' ) { return new ItemView( $fingerprintView, $claimsView, $language, $this->siteLinkGroups ); } elseif ( $entityType === 'property' ) { - $displayStatementsOnProperties = WikibaseRepo::getDefaultInstance()->getSettings() - ->getSetting( 'displayStatementsOnProperties' ); - - return new PropertyView( $fingerprintView, $claimsView, $language, $displayStatementsOnProperties ); + return new PropertyView( $fingerprintView, $claimsView, $language ); } throw new InvalidArgumentException( 'No EntityView for entity type: ' . $entityType ); diff --git a/repo/includes/View/PropertyView.php b/repo/includes/View/PropertyView.php index 54f832f..f11c28a 100644 --- a/repo/includes/View/PropertyView.php +++ b/repo/includes/View/PropertyView.php @@ -7,9 +7,6 @@ use Wikibase\DataModel\Entity\Property; use Wikibase\EntityRevision; use Wikibase\Repo\WikibaseRepo; -use Wikibase\Repo\View\FingerprintView; -use Wikibase\Repo\View\ClaimsView; -use Language; /** * Class for creating views for Property instances. @@ -22,23 +19,6 @@ * @author H. Snater < mediaw...@snater.com > */ class PropertyView extends EntityView { - - /** - * @var bool - */ - private $displayStatementsOnProperties; - - /** - * @param FingerprintView $fingerprintView - * @param ClaimsView $claimsView - * @param Language $language - * @param bool $displayStatementsOnProperties - */ - public function __construct( FingerprintView $fingerprintView, ClaimsView $claimsView, Language $language, $displayStatementsOnProperties ) { - parent::__construct($fingerprintView, $claimsView, $language); - - $this->displayStatementsOnProperties = $displayStatementsOnProperties; - } /** * @see EntityView::getMainHtml @@ -57,12 +37,10 @@ $html = parent::getMainHtml( $entityRevision, $entityInfo, $editable ); $html .= $this->getHtmlForDataType( $this->getDataType( $property ) ); - if ( $this->displayStatementsOnProperties ) { - $html .= $this->claimsView->getHtml( - $property->getStatements()->toArray(), - $entityInfo - ); - } + $html .= $this->claimsView->getHtml( + $property->getStatements()->toArray(), + $entityInfo + ); $footer = wfMessage( 'wikibase-property-footer' ); -- To view, visit https://gerrit.wikimedia.org/r/180467 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c2f02b5eafea8068add04e973ca531c24521248 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.25wmf12c Gerrit-Owner: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Hoo man <h...@online.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits