Alexia has uploaded a new change for review.
https://gerrit.wikimedia.org/r/316840
Change subject: Add back if()elseif() blocks.
......................................................................
Add back if()elseif() blocks.
Change-Id: Id51567450f78c847122bc74d81291bb8ebde89d5
---
M drilldown/CargoFilter.php
1 file changed, 9 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/40/316840/1
diff --git a/drilldown/CargoFilter.php b/drilldown/CargoFilter.php
index 2cb6d9e..dfebdb2 100644
--- a/drilldown/CargoFilter.php
+++ b/drilldown/CargoFilter.php
@@ -126,11 +126,15 @@
$date_field = $this->name;
$timePeriod = $this->getTimePeriod( $fullTextSearchTerm,
$appliedFilters );
- $fields = [
- "YEAR($date_field) AS year_field",
- "MONTH($date_field) AS month_field",
- "DAYOFMONTH($date_field) AS day_of_month_field"
- ];
+ if ( $timePeriod == 'day' ) {
+ $fields = "YEAR($date_field) AS year_field,
MONTH($date_field) AS month_field, DAYOFMONTH($date_field) AS
day_of_month_field";
+ } elseif ( $timePeriod == 'month' ) {
+ $fields = "YEAR($date_field) AS year_field,
MONTH($date_field) AS month_field";
+ } elseif ( $timePeriod == 'year' ) {
+ $fields = "YEAR($date_field) AS year_field";
+ } else { // if ( $timePeriod == 'decade' ) {
+ $fields = "YEAR($date_field) AS year_field";
+ }
list( $tableNames, $conds, $joinConds ) = $this->getQueryParts(
$fullTextSearchTerm, $appliedFilters );
$selectOptions = [ 'GROUP BY' => $fields, 'ORDER BY' => $fields
];
--
To view, visit https://gerrit.wikimedia.org/r/316840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id51567450f78c847122bc74d81291bb8ebde89d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Alexia <was...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
