jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394936 )
Change subject: BSFoundation: Added field type filter name mapping to database
writer
......................................................................
BSFoundation: Added field type filter name mapping to database writer
Change-Id: Ia1d94d7e8e598d3ff85bb4ee049528bd9950ab1e
---
M src/Data/DatabaseWriter.php
1 file changed, 24 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Data/DatabaseWriter.php b/src/Data/DatabaseWriter.php
index 895a809..a29e966 100644
--- a/src/Data/DatabaseWriter.php
+++ b/src/Data/DatabaseWriter.php
@@ -234,13 +234,36 @@
return [
Filter::KEY_FIELD => $fieldName,
Filter::KEY_VALUE => $record->get( $fieldName ),
- Filter::KEY_TYPE => $this->getFieldType( $fieldName ),
+ Filter::KEY_TYPE =>
$this->getFilterTypeFromFieldMapping( $fieldName ),
Filter::KEY_COMPARISON => Filter::COMPARISON_EQUALS,
];
}
+ /**
+ * Returns the field type defined in the related schema
+ * @param string $fieldName
+ * @return string
+ */
protected function getFieldType( $fieldName ) {
$schema = $this->getSchema();
return $schema[$fieldName][Schema::TYPE];
}
+
+ /**
+ * Field types are not equal filter names. Field type 'int' would be
filter
+ * 'numeric'. Overwrite this for special fields or when you use your own
+ * filters
+ * @param string $fieldName
+ * @return string
+ */
+ protected function getFilterTypeFromFieldMapping( $fieldName ) {
+ $fieldType = $this->getFieldType( $fieldName );
+ if( $fieldType === FieldType::INT ) {
+ return 'numeric';
+ }
+ if( $fieldType === FieldType::FLOAT ) {
+ return 'numeric';
+ }
+ return $fieldType;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/394936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1d94d7e8e598d3ff85bb4ee049528bd9950ab1e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth <[email protected]>
Gerrit-Reviewer: Ljonka <[email protected]>
Gerrit-Reviewer: Mglaser <[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
