From 757c78ea4a708d24c8264e4fc1ee94bdc9a700da Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Mon, 5 May 2014 07:11:19 +0200
Subject: [PATCH] fixes #4888 use today as default date for new annotations
---
plugins/Annotations/Controller.php | 2 ++
plugins/Annotations/templates/_annotationList.twig | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php
index 616da88ec1..9ea46d5680 100755
--- a/plugins/Annotations/Controller.php
+++ b/plugins/Annotations/Controller.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\Annotations;
use Piwik\API\Request;
use Piwik\Common;
+use Piwik\Date;
use Piwik\Piwik;
use Piwik\View;
@@ -70,6 +71,7 @@ class Controller extends \Piwik\Plugin\Controller
list($startDate, $endDate) = API::getDateRangeForPeriod($date, $period, $lastN);
$view->startDate = $startDate->toString();
$view->endDate = $endDate->toString();
+ $view->today = Date::today()->toString();
$dateFormat = Piwik::translate('CoreHome_ShortDateFormatWithYear');
$view->startDatePretty = $startDate->getLocalized($dateFormat);
diff --git a/plugins/Annotations/templates/_annotationList.twig b/plugins/Annotations/templates/_annotationList.twig
index 79f7f31c22..811f6c41a9 100755
--- a/plugins/Annotations/templates/_annotationList.twig
+++ b/plugins/Annotations/templates/_annotationList.twig
@@ -8,11 +8,11 @@
{% for annotation in annotations %}
{% include "@Annotations/_annotation.twig" %}
{% endfor %}
- <tr class="new-annotation-row" style="display:none;" data-date="{{ startDate }}">
+ <tr class="new-annotation-row" style="display:none;" data-date="{{ today }}">
<td class="annotation-meta">
<div class="annotation-star"> </div>
<div class="annotation-period-edit">
- <a href="#">{{ startDate }}</a>
+ <a href="#">{{ today }}</a>
<div class="datepicker" style="display:none;"/>
</div>
--
GitLab