diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-04-12 04:13:11 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-04-12 04:13:11 +0400 |
commit | 082b17d5c0c036d0dda039951cd35af3141377b9 (patch) | |
tree | cfded261ef0a64085cd2bd18f77bbbee0675fcfb /core/ViewDataTable | |
parent | 1790678894a8f3617800daa2a3c1a2b5e3ea3132 (diff) |
Refs #472 Introducing Secondary Dimension selector in the footer to let you choose which "sub table dimension" should be loaded
eg. when flattening the table, or clicking to load a subtable, you can choose between Event Category / Event Name / Event Action
Diffstat (limited to 'core/ViewDataTable')
-rw-r--r-- | core/ViewDataTable/Config.php | 13 | ||||
-rw-r--r-- | core/ViewDataTable/RequestConfig.php | 6 |
2 files changed, 17 insertions, 2 deletions
diff --git a/core/ViewDataTable/Config.php b/core/ViewDataTable/Config.php index 9fb0c0806b..ec1c2e229d 100644 --- a/core/ViewDataTable/Config.php +++ b/core/ViewDataTable/Config.php @@ -230,6 +230,12 @@ class Config public $related_reports = array(); /** + * "Related Reports" is displayed by default before listing the Related reports, + * The string can be changed. + */ + public $related_reports_title; + + /** * The report title. Used with related reports so report headings can be changed when switching * reports. * @@ -555,8 +561,11 @@ class Config list($module, $action) = explode('.', $relatedReport); // don't add the related report if it references this report - if ($this->controllerName == $module && $this->controllerAction == $action) { - return; + if ($this->controllerName == $module + && $this->controllerAction == $action) { + if(empty($queryParams)) { + return; + } } $url = ApiRequest::getBaseReportUrl($module, $action, $queryParams); diff --git a/core/ViewDataTable/RequestConfig.php b/core/ViewDataTable/RequestConfig.php index a816ee0031..ff4a6c0698 100644 --- a/core/ViewDataTable/RequestConfig.php +++ b/core/ViewDataTable/RequestConfig.php @@ -198,6 +198,12 @@ class RequestConfig */ public $disable_queued_filters = false; + /** + * returns 'Plugin.apiMethodName' used for this ViewDataTable, + * eg. 'Actions.getPageUrls' + * + * @var string + */ public $apiMethodToRequestDataTable = ''; /** |