rollup.html.erb in flapjack-0.7.29

- old
+ new

@@ -9,23 +9,23 @@
     border: 1px solid #666;
     padding: 4px;
   }
 </style>
 
-<p>Hi <%= @contact_first_name %></p>
+<p>Hi <%= @alert.contact_first_name %></p>
 
-<p>You have <%= @rollup_alerts.length %> alerting check<%= @rollup_alerts.length == 1 ? '' : 's' %> as follows:</p>
+<p>You have <%= @alert.rollup_alerts.length %> alerting check<%= @alert.rollup_alerts.length == 1 ? '' : 's' %> as follows:</p>
 
 <table>
   <tbody>
     <tr>
       <th>Check</th>
       <th>Entity</th>
       <th>State</th>
       <th>Duration</th>
     </tr>
-<%  @rollup_alerts.sort_by {|entity_check, details| details['duration'] }.each do |rollup_alert| -%>
+<%  @alert.rollup_alerts.sort_by {|entity_check, details| details['duration'] }.each do |rollup_alert| -%>
 <%    r_entity, r_check = rollup_alert[0].split(':', 2) -%>
 <%    state    = rollup_alert[1]['state'] -%>
 <%    duration = ChronicDuration.output(rollup_alert[1]['duration']) -%>
       <tr>
         <td><%= r_check %></td>
@@ -35,13 +35,13 @@
       </tr>
 <%    end %>
   </tbody>
 </table>
 
-<% if @rollup.downcase == 'recovery' %>
-  <p>As your email summary threshold is <%= @rollup_threshold %>, we're taking your email alerts out of summary mode now. You'll now be emailed individually for each alerting check.</p>
+<% if @alert.rollup == 'recovery' %>
+  <p>As your email summary threshold is <%= @alert.rollup_threshold %>, we're taking your email alerts out of summary mode now. You'll now be emailed individually for each alerting check.</p>
 <% else %>
-  <p>Your email alerts are being summarised as your email summary threshold is set to <%= @rollup_threshold %>. You'll receive summary emails like this one until your number of alerting checks falls below <%= @rollup_threshold %>.</p>
+  <p>Your email alerts are being summarised as your email summary threshold is set to <%= @alert.rollup_threshold %>. You'll receive summary emails like this one until your number of alerting checks falls below <%= @alert.rollup_threshold %>.</p>
 <% end %>
 
 <p>Cheers,<br/>
 Flapjack</p>
 