John Erling Blad has submitted this change and it was merged.
Change subject: Implemented getLabelFieldName in the DVHandlers
......................................................................
Implemented getLabelFieldName in the DVHandlers
Change-Id: I40e3d225923baa9fe7f1235318f671f87e56883b
---
M repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
M repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
M repo/includes/Query/SQLStore/DVHandler/NumberHandler.php
M repo/includes/Query/SQLStore/DVHandler/StringHandler.php
4 files changed, 2 insertions(+), 24 deletions(-)
Approvals:
John Erling Blad: Verified; Looks good to me, approved
diff --git a/repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
b/repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
index a275ef3..8381802 100644
--- a/repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
+++ b/repo/includes/Query/SQLStore/DVHandler/EntityIdHandler.php
@@ -91,17 +91,6 @@
}
/**
- * @see DataValueHandler::getLabelFieldName
- *
- * @since wd.qe
- *
- * @return string|null
- */
- public function getLabelFieldName() {
- return null;
- }
-
- /**
* @see DataValueHandler::getWhereConditions
*
* @since wd.qe
diff --git a/repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
b/repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
index 5b6c7ca..99fa5c1 100644
--- a/repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
+++ b/repo/includes/Query/SQLStore/DVHandler/GeoCoordinateHandler.php
@@ -93,17 +93,6 @@
}
/**
- * @see DataValueHandler::getLabelFieldName
- *
- * @since wd.qe
- *
- * @return string|null
- */
- public function getLabelFieldName() {
- return null;
- }
-
- /**
* @see DataValueHandler::getWhereConditions
*
* @since wd.qe
diff --git a/repo/includes/Query/SQLStore/DVHandler/NumberHandler.php
b/repo/includes/Query/SQLStore/DVHandler/NumberHandler.php
index 1e9af3a..781c548 100644
--- a/repo/includes/Query/SQLStore/DVHandler/NumberHandler.php
+++ b/repo/includes/Query/SQLStore/DVHandler/NumberHandler.php
@@ -97,7 +97,7 @@
* @return string|null
*/
public function getLabelFieldName() {
- return null;
+ return 'value';
}
/**
diff --git a/repo/includes/Query/SQLStore/DVHandler/StringHandler.php
b/repo/includes/Query/SQLStore/DVHandler/StringHandler.php
index 7965876..db45228 100644
--- a/repo/includes/Query/SQLStore/DVHandler/StringHandler.php
+++ b/repo/includes/Query/SQLStore/DVHandler/StringHandler.php
@@ -96,7 +96,7 @@
* @return string|null
*/
public function getLabelFieldName() {
- return null;
+ return 'value';
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/52208
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40e3d225923baa9fe7f1235318f671f87e56883b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: John Erling Blad <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
