diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2017-10-03 23:22:01 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-03 23:22:01 +0300 |
commit | 9af4e95aa976f3a6533e95b776b5298f73e5f916 (patch) | |
tree | d612cd4d32019e9e52ce1398b8bf214ec06a8e0f /plugins/Resolution | |
parent | 359c3ec875b554c7b71a933b26d18cdde0bb8f4e (diff) |
Better segment editor and fixes (#12040)
* column tweak
* fix install
* more tweaks
* rename column to dimension
* various fixes
* added new control expandable select
* starting to refactor segment selector
* make segment editor work again
* use translation keys
* defined some metrics
* set types
* simplify
* simplify
* fix join generator
* add possibility to use custom join table names when using query builder and it uses an inner query
* fix bug in query selector when selecting same field name from different tables twice
* more metadata
* more tweaks
* improve selector
* add possibility to use custom entity names
* also processed archived metrics
* generate sql filter, suggested values callback, and accept values automatically for columns with enums
* several tweaks
* focus search field when opening it
* various tweaks
* added missing method
* format and fix more metadata
* more fixes
* better definition
* define custom filter
* fix definition
* fix various tests
* fix more tests
* fix bug in logquery builder
* fix referrerurl segment was missing
* fix some tests
* fix more tests
* add group
* refactor for better definition
* fix a bug in log query builder when similar columns are used in archiver
* add goal metrics
* various fixes
* make datatable row more flexible
* various fixes and visualization enhancements
* simply segment editor and make it smaller
* remove trailing comma
* various fixes and added new dimension
* fix formatting of returning customer
* added missing primary key
* fixes
* various fixes and improvements
* make sure to update segment definition when selecting a value from auto complete list
* various fixes and more metrics
* more metrics
* more dimensions and fixes
* fix some tests
* fix some integration tests
* update submodule
* fix some system tests
* fix ui tests
* trigger new test run
* fix more ui tests
* fix system tests
* update submodule
* fix categories
* sort segments by category for more consistency
* add custom variables
* some translations and fixes
* add minute segment
* more segments
* added plurals
* added some docs
* fix test
* fix tests
* fix tests
* added suggested values
* fix some tests
* various fixes
* fix more tests
* allow to select segments on any site
* make sure to include file
* added doc block
* fix some system tests
* fix most system tests
* fix ui test
* fix system test
* adjust examples
* added more tests and docs
* no metrics for these dimensions
* added developer changelog and made some classes public api
* some fixes for entity names
* add possibility to set format metrics in test
* more consistency in defining the name
* get idsites only if provided
* fix integration tests
* added another segment for visit start hour and visit start minute
* more clear name for segment
* use old segment name to not break bc
* various fixes
* more test fixes
* fix no suggested values for new segment
* add event value
* for boolean dimensions only sum metric
* update available widgets when updating reporting menu
* Add new segments in developer changelog + typo
* fix system tests
* fix screenshot test
Diffstat (limited to 'plugins/Resolution')
-rw-r--r-- | plugins/Resolution/Columns/Configuration.php | 5 | ||||
-rw-r--r-- | plugins/Resolution/Columns/Resolution.php | 19 | ||||
-rw-r--r-- | plugins/Resolution/Segment.php | 21 |
3 files changed, 6 insertions, 39 deletions
diff --git a/plugins/Resolution/Columns/Configuration.php b/plugins/Resolution/Columns/Configuration.php index 6929457495..22f2392897 100644 --- a/plugins/Resolution/Columns/Configuration.php +++ b/plugins/Resolution/Columns/Configuration.php @@ -13,8 +13,5 @@ use Piwik\Piwik; class Configuration extends Dimension { - public function getName() - { - return Piwik::translate('Resolution_ColumnConfiguration'); - } + protected $nameSingular = 'Resolution_ColumnConfiguration'; }
\ No newline at end of file diff --git a/plugins/Resolution/Columns/Resolution.php b/plugins/Resolution/Columns/Resolution.php index 53a5f8cc4d..b13ce11b31 100644 --- a/plugins/Resolution/Columns/Resolution.php +++ b/plugins/Resolution/Columns/Resolution.php @@ -10,7 +10,6 @@ namespace Piwik\Plugins\Resolution\Columns; use Piwik\Piwik; use Piwik\Plugin\Dimension\VisitDimension; -use Piwik\Plugins\Resolution\Segment; use Piwik\Tracker\Action; use Piwik\Tracker\Request; use Piwik\Tracker\Visitor; @@ -19,15 +18,11 @@ class Resolution extends VisitDimension { protected $columnName = 'config_resolution'; protected $columnType = 'VARCHAR(18) NULL'; - - protected function configureSegments() - { - $segment = new Segment(); - $segment->setSegment('resolution'); - $segment->setName('Resolution_ColumnResolution'); - $segment->setAcceptedValues('1280x1024, 800x600, etc.'); - $this->addSegment($segment); - } + protected $acceptValues = '1280x1024, 800x600, etc.'; + protected $segmentName = 'resolution'; + protected $nameSingular = 'Resolution_ColumnResolution'; + protected $namePlural = 'Resolution_Resolutions'; + protected $type = self::TYPE_TEXT; /** * @param Request $request @@ -46,8 +41,4 @@ class Resolution extends VisitDimension return $resolution; } - public function getName() - { - return Piwik::translate('Resolution_ColumnResolution'); - } }
\ No newline at end of file diff --git a/plugins/Resolution/Segment.php b/plugins/Resolution/Segment.php deleted file mode 100644 index e21a2973d7..0000000000 --- a/plugins/Resolution/Segment.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\Resolution; - -/** - * Resolution segment base class. - * - */ -class Segment extends \Piwik\Plugin\Segment -{ - protected function init() - { - $this->setCategory('General_Visit'); - } -} |