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:
authorChristian Schmidt <github@chsc.dk>2019-02-25 16:20:29 +0300
committerStefan Giehl <stefan@matomo.org>2019-02-25 16:20:29 +0300
commita7510a3514dc6803395c20edad198a79dab2fc7a (patch)
tree3ca44da40d770ef7d18e2134bc8a94e82a9d1dff /plugins/ScheduledReports
parent4f7150f9324f1c6a1908b60eeb3c8d41ce8f2445 (diff)
Do not render until form is initialized (#14016)
* Do not render until form is initialized * Update screenshot
Diffstat (limited to 'plugins/ScheduledReports')
-rw-r--r--plugins/ScheduledReports/angularjs/manage-scheduled-report/manage-scheduled-report.controller.js12
-rw-r--r--plugins/ScheduledReports/templates/_addReport.twig2
2 files changed, 8 insertions, 6 deletions
diff --git a/plugins/ScheduledReports/angularjs/manage-scheduled-report/manage-scheduled-report.controller.js b/plugins/ScheduledReports/angularjs/manage-scheduled-report/manage-scheduled-report.controller.js
index ccb107b742..5ddcb61df9 100644
--- a/plugins/ScheduledReports/angularjs/manage-scheduled-report/manage-scheduled-report.controller.js
+++ b/plugins/ScheduledReports/angularjs/manage-scheduled-report/manage-scheduled-report.controller.js
@@ -79,12 +79,14 @@
report.hour = adjustHourToTimezone(report.hour, getTimeZoneDifferenceInHours());
updateReportHourUtc(report);
- $('[name=reportsList] input').prop('checked', false);
+ setTimeout(function() {
+ $('[name=reportsList] input').prop('checked', false);
- var key;
- for (key in report.reports) {
- $('.' + report.type + ' [report-unique-id=' + report.reports[key] + ']').prop('checked', 'checked');
- }
+ var key;
+ for (key in report.reports) {
+ $('.' + report.type + ' [report-unique-id=' + report.reports[key] + ']').prop('checked', 'checked');
+ }
+ });
report['format' + report.type] = report.format;
diff --git a/plugins/ScheduledReports/templates/_addReport.twig b/plugins/ScheduledReports/templates/_addReport.twig
index 9de8df56ba..30a63bb40d 100644
--- a/plugins/ScheduledReports/templates/_addReport.twig
+++ b/plugins/ScheduledReports/templates/_addReport.twig
@@ -1,7 +1,7 @@
<div piwik-content-block
content-title="{{ 'ScheduledReports_CreateAndScheduleReport'|translate|e('html_attr') }}"
class="entityAddContainer"
- ng-show="manageScheduledReport.showReportForm">
+ ng-if="manageScheduledReport.showReportForm">
<div class='clear'></div>
<form id='addEditReport' piwik-form ng-submit="manageScheduledReport.submitReport()">