Skip to content
Extraits de code Groupes Projets
Valider 757c78ea rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

fixes #4888 use today as default date for new annotations

parent 0670900b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -10,6 +10,7 @@ namespace Piwik\Plugins\Annotations; ...@@ -10,6 +10,7 @@ namespace Piwik\Plugins\Annotations;
use Piwik\API\Request; use Piwik\API\Request;
use Piwik\Common; use Piwik\Common;
use Piwik\Date;
use Piwik\Piwik; use Piwik\Piwik;
use Piwik\View; use Piwik\View;
...@@ -70,6 +71,7 @@ class Controller extends \Piwik\Plugin\Controller ...@@ -70,6 +71,7 @@ class Controller extends \Piwik\Plugin\Controller
list($startDate, $endDate) = API::getDateRangeForPeriod($date, $period, $lastN); list($startDate, $endDate) = API::getDateRangeForPeriod($date, $period, $lastN);
$view->startDate = $startDate->toString(); $view->startDate = $startDate->toString();
$view->endDate = $endDate->toString(); $view->endDate = $endDate->toString();
$view->today = Date::today()->toString();
$dateFormat = Piwik::translate('CoreHome_ShortDateFormatWithYear'); $dateFormat = Piwik::translate('CoreHome_ShortDateFormatWithYear');
$view->startDatePretty = $startDate->getLocalized($dateFormat); $view->startDatePretty = $startDate->getLocalized($dateFormat);
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
{% for annotation in annotations %} {% for annotation in annotations %}
{% include "@Annotations/_annotation.twig" %} {% include "@Annotations/_annotation.twig" %}
{% endfor %} {% 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"> <td class="annotation-meta">
<div class="annotation-star">&nbsp;</div> <div class="annotation-star">&nbsp;</div>
<div class="annotation-period-edit"> <div class="annotation-period-edit">
<a href="#">{{ startDate }}</a> <a href="#">{{ today }}</a>
<div class="datepicker" style="display:none;"/> <div class="datepicker" style="display:none;"/>
</div> </div>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter