diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-02-13 20:50:22 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-02-13 20:50:22 +0300 |
| commit | 806bedba1a43d7d78b687d1d23a6b861a2b70035 (patch) | |
| tree | 19f9ae52817f93b74a9d34f31af48dd9d59d6a74 /core/DataTable | |
| parent | b18b499688bcabcc3aa0b358dbc78936a9f607e2 (diff) | |
refs #4633 rename segmentFilter => segment
Diffstat (limited to 'core/DataTable')
5 files changed, 7 insertions, 7 deletions
diff --git a/core/DataTable/Filter/AddSegmentFilter.php b/core/DataTable/Filter/AddSegmentFilter.php index 05b5d8e884..48093284a9 100644 --- a/core/DataTable/Filter/AddSegmentFilter.php +++ b/core/DataTable/Filter/AddSegmentFilter.php @@ -75,7 +75,7 @@ class AddSegmentFilter extends BaseFilter $label = $row->getColumn('label'); if (!empty($label)) { - $row->setMetadata('segmentFilter', $segment . '==' . urlencode($label)); + $row->setMetadata('segment', $segment . '==' . urlencode($label)); } } }); @@ -100,7 +100,7 @@ class AddSegmentFilter extends BaseFilter $filter[] = $segment . '==' . urlencode($parts[$index]); } } - $row->setMetadata('segmentFilter', implode($conditionAnd, $filter)); + $row->setMetadata('segment', implode($conditionAnd, $filter)); } } } diff --git a/core/DataTable/Filter/AddSegmentFilterByLabelMapping.php b/core/DataTable/Filter/AddSegmentFilterByLabelMapping.php index 41f3e18cf1..8a69376938 100644 --- a/core/DataTable/Filter/AddSegmentFilterByLabelMapping.php +++ b/core/DataTable/Filter/AddSegmentFilterByLabelMapping.php @@ -60,7 +60,7 @@ class AddSegmentFilterByLabelMapping extends BaseFilter if (!empty($mapping[$label])) { $label = $mapping[$label]; - $row->setMetadata('segmentFilter', $segment . '==' . urlencode($label)); + $row->setMetadata('segment', $segment . '==' . urlencode($label)); } } }); diff --git a/core/DataTable/Filter/AddSegmentFilterBySegmentValue.php b/core/DataTable/Filter/AddSegmentFilterBySegmentValue.php index 2be32c6394..fd185efeaa 100644 --- a/core/DataTable/Filter/AddSegmentFilterBySegmentValue.php +++ b/core/DataTable/Filter/AddSegmentFilterBySegmentValue.php @@ -68,10 +68,10 @@ class AddSegmentFilterBySegmentValue extends BaseFilter foreach ($table->getRows() as $row) { $value = $row->getMetadata('segmentValue'); - $filter = $row->getMetadata('segmentFilter'); + $filter = $row->getMetadata('segment'); if ($value !== false && $filter === false) { - $row->setMetadata('segmentFilter', sprintf('%s==%s', $segmentName, urlencode($value))); + $row->setMetadata('segment', sprintf('%s==%s', $segmentName, urlencode($value))); } } } diff --git a/core/DataTable/Filter/PrependSegmentFilter.php b/core/DataTable/Filter/PrependSegmentFilter.php index 36f1772ff4..41718b661f 100644 --- a/core/DataTable/Filter/PrependSegmentFilter.php +++ b/core/DataTable/Filter/PrependSegmentFilter.php @@ -29,6 +29,6 @@ class PrependSegmentFilter extends PrependValueToMetadata */ public function __construct($table, $prependSegmentFilter = '') { - parent::__construct($table, 'segmentFilter', $prependSegmentFilter); + parent::__construct($table, 'segment', $prependSegmentFilter); } } diff --git a/core/DataTable/Filter/PrependValueToMetadata.php b/core/DataTable/Filter/PrependValueToMetadata.php index 564372daba..3e2e0ceb82 100644 --- a/core/DataTable/Filter/PrependValueToMetadata.php +++ b/core/DataTable/Filter/PrependValueToMetadata.php @@ -17,7 +17,7 @@ use Piwik\DataTable\BaseFilter; * * **Basic usage example** * - * $dataTable->filter('PrependValueToMetadata', array('segmentFilter', 'segmentName==segmentValue')); + * $dataTable->filter('PrependValueToMetadata', array('segment', 'segmentName==segmentValue')); * * @api */ |