Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2017-10-03 23:22:01 +0300
committerGitHub <noreply@github.com>2017-10-03 23:22:01 +0300
commit9af4e95aa976f3a6533e95b776b5298f73e5f916 (patch)
treed612cd4d32019e9e52ce1398b8bf214ec06a8e0f /plugins/DevicePlugins
parent359c3ec875b554c7b71a933b26d18cdde0bb8f4e (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/DevicePlugins')
-rw-r--r--plugins/DevicePlugins/Columns/Plugin.php5
-rw-r--r--plugins/DevicePlugins/Columns/PluginCookie.php1
-rw-r--r--plugins/DevicePlugins/Columns/PluginDirector.php1
-rw-r--r--plugins/DevicePlugins/Columns/PluginFlash.php1
-rw-r--r--plugins/DevicePlugins/Columns/PluginGears.php1
-rw-r--r--plugins/DevicePlugins/Columns/PluginJava.php1
-rw-r--r--plugins/DevicePlugins/Columns/PluginPdf.php1
-rw-r--r--plugins/DevicePlugins/Columns/PluginQuickTime.php1
-rw-r--r--plugins/DevicePlugins/Columns/PluginRealPlayer.php1
-rw-r--r--plugins/DevicePlugins/Columns/PluginSilverlight.php1
-rw-r--r--plugins/DevicePlugins/Columns/PluginWindowsMedia.php1
11 files changed, 11 insertions, 4 deletions
diff --git a/plugins/DevicePlugins/Columns/Plugin.php b/plugins/DevicePlugins/Columns/Plugin.php
index 0066c5ce19..a01d01c57c 100644
--- a/plugins/DevicePlugins/Columns/Plugin.php
+++ b/plugins/DevicePlugins/Columns/Plugin.php
@@ -13,8 +13,5 @@ use Piwik\Piwik;
class Plugin extends Dimension
{
- public function getName()
- {
- return Piwik::translate('General_Plugin');
- }
+ protected $nameSingular = 'General_Plugin';
} \ No newline at end of file
diff --git a/plugins/DevicePlugins/Columns/PluginCookie.php b/plugins/DevicePlugins/Columns/PluginCookie.php
index 19dd1e226d..b07aad3587 100644
--- a/plugins/DevicePlugins/Columns/PluginCookie.php
+++ b/plugins/DevicePlugins/Columns/PluginCookie.php
@@ -17,6 +17,7 @@ class PluginCookie extends DevicePluginColumn
{
protected $columnName = 'config_cookie';
protected $columnType = 'TINYINT(1) NULL';
+ protected $type = self::TYPE_BOOL;
/**
* @param Request $request
diff --git a/plugins/DevicePlugins/Columns/PluginDirector.php b/plugins/DevicePlugins/Columns/PluginDirector.php
index b1b479d92d..209e718c6e 100644
--- a/plugins/DevicePlugins/Columns/PluginDirector.php
+++ b/plugins/DevicePlugins/Columns/PluginDirector.php
@@ -17,6 +17,7 @@ class PluginDirector extends DevicePluginColumn
{
protected $columnName = 'config_director';
protected $columnType = 'TINYINT(1) NULL';
+ protected $type = self::TYPE_BOOL;
/**
* @param Request $request
diff --git a/plugins/DevicePlugins/Columns/PluginFlash.php b/plugins/DevicePlugins/Columns/PluginFlash.php
index e307ef0c84..2b17c70681 100644
--- a/plugins/DevicePlugins/Columns/PluginFlash.php
+++ b/plugins/DevicePlugins/Columns/PluginFlash.php
@@ -17,6 +17,7 @@ class PluginFlash extends DevicePluginColumn
{
protected $columnName = 'config_flash';
protected $columnType = 'TINYINT(1) NULL';
+ protected $type = self::TYPE_BOOL;
/**
* @param Request $request
diff --git a/plugins/DevicePlugins/Columns/PluginGears.php b/plugins/DevicePlugins/Columns/PluginGears.php
index c0845f0904..c8b40235f4 100644
--- a/plugins/DevicePlugins/Columns/PluginGears.php
+++ b/plugins/DevicePlugins/Columns/PluginGears.php
@@ -17,6 +17,7 @@ class PluginGears extends DevicePluginColumn
{
protected $columnName = 'config_gears';
protected $columnType = 'TINYINT(1) NULL';
+ protected $type = self::TYPE_BOOL;
/**
* @param Request $request
diff --git a/plugins/DevicePlugins/Columns/PluginJava.php b/plugins/DevicePlugins/Columns/PluginJava.php
index bd9877a1b5..d23c3a3c3e 100644
--- a/plugins/DevicePlugins/Columns/PluginJava.php
+++ b/plugins/DevicePlugins/Columns/PluginJava.php
@@ -17,6 +17,7 @@ class PluginJava extends DevicePluginColumn
{
protected $columnName = 'config_java';
protected $columnType = 'TINYINT(1) NULL';
+ protected $type = self::TYPE_BOOL;
/**
* @param Request $request
diff --git a/plugins/DevicePlugins/Columns/PluginPdf.php b/plugins/DevicePlugins/Columns/PluginPdf.php
index bd1fccfad3..69945b3d66 100644
--- a/plugins/DevicePlugins/Columns/PluginPdf.php
+++ b/plugins/DevicePlugins/Columns/PluginPdf.php
@@ -17,6 +17,7 @@ class PluginPdf extends DevicePluginColumn
{
protected $columnName = 'config_pdf';
protected $columnType = 'TINYINT(1) NULL';
+ protected $type = self::TYPE_BOOL;
/**
* @param Request $request
diff --git a/plugins/DevicePlugins/Columns/PluginQuickTime.php b/plugins/DevicePlugins/Columns/PluginQuickTime.php
index a203dedccb..57e6bc754e 100644
--- a/plugins/DevicePlugins/Columns/PluginQuickTime.php
+++ b/plugins/DevicePlugins/Columns/PluginQuickTime.php
@@ -17,6 +17,7 @@ class PluginQuickTime extends DevicePluginColumn
{
protected $columnName = 'config_quicktime';
protected $columnType = 'TINYINT(1) NULL';
+ protected $type = self::TYPE_BOOL;
/**
* @param Request $request
diff --git a/plugins/DevicePlugins/Columns/PluginRealPlayer.php b/plugins/DevicePlugins/Columns/PluginRealPlayer.php
index d805aafccd..2de970caa4 100644
--- a/plugins/DevicePlugins/Columns/PluginRealPlayer.php
+++ b/plugins/DevicePlugins/Columns/PluginRealPlayer.php
@@ -17,6 +17,7 @@ class PluginRealPlayer extends DevicePluginColumn
{
protected $columnName = 'config_realplayer';
protected $columnType = 'TINYINT(1) NULL';
+ protected $type = self::TYPE_BOOL;
/**
* @param Request $request
diff --git a/plugins/DevicePlugins/Columns/PluginSilverlight.php b/plugins/DevicePlugins/Columns/PluginSilverlight.php
index 897d2939da..154aea8975 100644
--- a/plugins/DevicePlugins/Columns/PluginSilverlight.php
+++ b/plugins/DevicePlugins/Columns/PluginSilverlight.php
@@ -17,6 +17,7 @@ class PluginSilverlight extends DevicePluginColumn
{
protected $columnName = 'config_silverlight';
protected $columnType = 'TINYINT(1) NULL';
+ protected $type = self::TYPE_BOOL;
/**
* @param Request $request
diff --git a/plugins/DevicePlugins/Columns/PluginWindowsMedia.php b/plugins/DevicePlugins/Columns/PluginWindowsMedia.php
index 99e25f4bdc..6318fd0f55 100644
--- a/plugins/DevicePlugins/Columns/PluginWindowsMedia.php
+++ b/plugins/DevicePlugins/Columns/PluginWindowsMedia.php
@@ -17,6 +17,7 @@ class PluginWindowsMedia extends DevicePluginColumn
{
protected $columnName = 'config_windowsmedia';
protected $columnType = 'TINYINT(1) NULL';
+ protected $type = self::TYPE_BOOL;
/**
* @param Request $request