refs matomo-org#1486 make it possible to reuse only phoneNumbers and …

…emails without the html for graph type
sabl0r · Jan 6, 2014 · c2d8069 · c2d8069
1 parent 0ba17e0
commit c2d8069
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 25 deletions.
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
diff --git a/plugins/Morpheus/javascripts/morpheus.js b/plugins/Morpheus/javascripts/morpheus.js
@@ -11,7 +11,7 @@ $(document).ready(function () {
     }
 
     initICheck();
-    $(document).bind('ScheduledRepot.edit', initICheck);
+    $(document).bind('ScheduledReport.edit', initICheck);
 
     $('body').on('ifClicked', 'input', function () {
         $(this).trigger('click');

diff --git a/plugins/ScheduledReports/Controller.php b/plugins/ScheduledReports/Controller.php
@@ -37,6 +37,7 @@ public function index()
         $view->reportTypes = $reportTypes;
         $view->defaultReportType = self::DEFAULT_REPORT_TYPE;
         $view->defaultReportFormat = ScheduledReports::DEFAULT_REPORT_FORMAT;
+        $view->displayFormats = ScheduledReports::getDisplayFormats();
 
         $reportsByCategoryByType = array();
         $reportFormatsByReportType = array();

diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php
@@ -403,7 +403,6 @@ static public function template_reportParametersScheduledReports(&$out)
     {
         $view = new View('@ScheduledReports/reportParametersScheduledReports');
         $view->currentUserEmail = Piwik::getCurrentUserEmail();
-        $view->displayFormats = self::getDisplayFormats();
         $view->reportType = self::EMAIL_TYPE;
         $view->defaultDisplayFormat = self::DEFAULT_DISPLAY_FORMAT;
         $view->defaultEmailMe = self::EMAIL_ME_PARAMETER_DEFAULT_VALUE ? 'true' : 'false';
@@ -562,7 +561,7 @@ private static function checkAdditionalEmails($additionalEmails)
         return $additionalEmails;
     }
 
-    private static function getDisplayFormats()
+    public static function getDisplayFormats()
     {
         $displayFormats = array(
             // ScheduledReports_AggregateReportsFormat_TablesOnly should be named ScheduledReports_DisplayFormat_GraphsOnlyForKeyMetrics

diff --git a/plugins/ScheduledReports/javascripts/pdf.js b/plugins/ScheduledReports/javascripts/pdf.js
@@ -160,7 +160,7 @@ function initManagePdf() {
         formSetEditReport(idReport);
         $('.entityAddContainer').show();
         $('#entityEditContainer').hide();
-        $(document).trigger('ScheduledRepot.edit', {});
+        $(document).trigger('ScheduledReport.edit', {});
     });
 
     // Switch Report Type

diff --git a/plugins/ScheduledReports/templates/_addReport.twig b/plugins/ScheduledReports/templates/_addReport.twig
@@ -100,6 +100,26 @@
 
             {{ postEvent("Template.reportParametersScheduledReports") }}
 
+            <tr class='email'>
+                <td class="first">
+                    {# ScheduledReports_AggregateReportsFormat should be named ScheduledReports_DisplayFormat #}
+                    {{ 'ScheduledReports_AggregateReportsFormat'|translate }}
+                </td>
+                <td>
+                    <select id="display_format">
+                        {% for formatValue, formatLabel in displayFormats %}
+                            <option {% if formatValue==1 %}selected{% endif %} value="{{ formatValue }}">{{ formatLabel }}</option>
+                        {% endfor %}
+                    </select>
+
+                    <div class='report_evolution_graph'>
+                        <br/>
+                        <input type="checkbox" id="report_evolution_graph"/>
+                        <label for="report_evolution_graph"><em>{{ 'ScheduledReports_EvolutionGraph'|translate(5) }}</em></label>
+                    </div>
+                </td>
+            </tr>
+
             <tr>
                 <td class="first">{{ 'ScheduledReports_ReportsIncluded'|translate }}</td>
                 <td>

diff --git a/plugins/ScheduledReports/templates/reportParametersScheduledReports.twig b/plugins/ScheduledReports/templates/reportParametersScheduledReports.twig
@@ -42,6 +42,8 @@
                     $('#report_additional_emails').text(reportParameters.additionalEmails.join('\n'));
                 else
                     $('#report_additional_emails').html('');
+
+                $(document).trigger('ScheduledReport.edit', {});
             };
 
         getReportParametersFunctions['{{ reportType }}'] =
@@ -74,23 +76,4 @@
         {{ 'ScheduledReports_AlsoSendReportToTheseEmails'|translate }}<br/>
         <textarea cols="30" rows="3" id="report_additional_emails" class="inp"></textarea>
     </td>
-</tr>
-<tr class='{{ reportType }}'>
-    <td class="first">
-        {# ScheduledReports_AggregateReportsFormat should be named ScheduledReports_DisplayFormat #}
-        {{ 'ScheduledReports_AggregateReportsFormat'|translate }}
-    </td>
-    <td>
-        <select id="display_format">
-            {% for formatValue, formatLabel in displayFormats %}
-                <option {% if formatValue==1 %}selected{% endif %} value="{{ formatValue }}">{{ formatLabel }}</option>
-            {% endfor %}
-        </select>
-
-        <div class='report_evolution_graph'>
-            <br/>
-            <input type="checkbox" id="report_evolution_graph"/>
-            <label for="report_evolution_graph"><em>{{ 'ScheduledReports_EvolutionGraph'|translate(5) }}</em></label>
-        </div>
-    </td>
-</tr>
+</tr>