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:
authormatthieu_ <matthieu_@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2007-09-12 20:05:31 +0400
committermatthieu_ <matthieu_@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2007-09-12 20:05:31 +0400
commit12d49739ea8e07ebfafc41a7d8620ba62e362079 (patch)
tree9f7c2f4819848a3796bc8de561a7c547cc981a23 /plugins
parenta47b1c0555fbedd4d41b7e12d52cc1be5ae1f53a (diff)
Fixed bug when date=today/yesterday
Added display action datatable
Diffstat (limited to 'plugins')
-rw-r--r--plugins/UserSettings/Controller.php11
-rw-r--r--plugins/UserSettings/templates/index.tpl2
2 files changed, 6 insertions, 7 deletions
diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php
index beef73e356..e4651507c8 100644
--- a/plugins/UserSettings/Controller.php
+++ b/plugins/UserSettings/Controller.php
@@ -8,8 +8,9 @@ class Piwik_UserSettings_Controller extends Piwik_Controller
{
$view = new Piwik_View('UserSettings/templates/index.tpl');
-
- $view->date = Piwik_Common::getRequestVar('date');
+ $oDate = Piwik_Date::factory(Piwik_Common::getRequestVar('date'));
+ $date = $oDate->toString();
+ $view->date = $date;
$view->period = Piwik_Common::getRequestVar('period');
$view->idSite = Piwik_Common::getRequestVar('idSite');
@@ -34,9 +35,9 @@ class Piwik_UserSettings_Controller extends Piwik_Controller
$view->maxActions = $dataTableVisit->getColumn('max_actions');
/* Actions / Downloads / Outlinks */
-// $view->dataTableActions = $this->getActions( true );
-// $view->dataTableDownloads = $this->getDownloads( true );
-// $view->dataTableOutlinks = $this->getOutlinks( true );
+ $view->dataTableActions = $this->getActions( true );
+ $view->dataTableDownloads = $this->getDownloads( true );
+ $view->dataTableOutlinks = $this->getOutlinks( true );
/* User Country */
$view->dataTableCountry = $this->getCountry(true);
diff --git a/plugins/UserSettings/templates/index.tpl b/plugins/UserSettings/templates/index.tpl
index 48eb5b80a7..4405f3f9ad 100644
--- a/plugins/UserSettings/templates/index.tpl
+++ b/plugins/UserSettings/templates/index.tpl
@@ -82,7 +82,6 @@ tr td.label img.plusMinus {
{include file="UserSettings/templates/sites_select.tpl"}<br>
</div>
-{*
<h2>Actions</h2>
{$dataTableActions}
<h2>Downloads</h2>
@@ -90,7 +89,6 @@ tr td.label img.plusMinus {
<h2>Outlinks</h2>
{$dataTableOutlinks}
-*}
<h2>Visits summary</h2>
<p>{$nbUniqVisitors} unique visitors</p>
<p>{$nbVisits} visits</p>