Do not render until form is initialized (matomo-org#14016)

* Do not render until form is initialized * Update screenshot
fdellwing · Feb 25, 2019 · a7510a3 · a7510a3
1 parent 4f7150f
commit a7510a3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.../ScheduledReports/angularjs/manage-scheduled-report/manage-scheduled-report.controller.js b/.../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
@@ -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()">
 

diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png b/tests/UI/expected-screenshots/UIIntegrationTest_email_reports_editor.png