[Rt-commit] r13825 - in rt/3.8/trunk: . sbin

[sartak at bestpractical.com]

Author: sartak
Date: Mon Jul  7 10:37:31 2008
New Revision: 13825

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/sbin/rt-email-dashboards.in
   rt/3.8/trunk/share/html/Dashboards/Subscription.html

Log:
 r63763 at onn:  sartak | 2008-07-07 10:36:03 -0400
 Add a "never" frequency for subscriptions, and move the hour field down below frequency


Modified: rt/3.8/trunk/sbin/rt-email-dashboards.in
==============================================================================
--- rt/3.8/trunk/sbin/rt-email-dashboards.in	(original)
+++ rt/3.8/trunk/sbin/rt-email-dashboards.in	Mon Jul  7 10:37:31 2008
@@ -157,6 +157,8 @@
         if (!$opts{all}) {
             vverbose "Checking against subscription with frequency [_1], hour [_2], dow [_3], dom [_4]", $subscription->SubValue('Frequency'), $subscription->SubValue('Hour'), $subscription->SubValue('Dow'), $subscription->SubValue('Dom');
 
+            next if $subscription->SubValue('Frequency') eq 'never';
+
             # correct hour?
             next if $subscription->SubValue('Hour') ne $hour;
 

Modified: rt/3.8/trunk/share/html/Dashboards/Subscription.html
==============================================================================
--- rt/3.8/trunk/share/html/Dashboards/Subscription.html	(original)
+++ rt/3.8/trunk/share/html/Dashboards/Subscription.html	Mon Jul  7 10:37:31 2008
@@ -98,21 +98,6 @@
 
 <table>
 <tr><td class="label">
-<&|/l&>Hour</&>:
-</td><td class="value">
-<select name="Hour">
-% for my $hour (0..23) {
-%     my $formatted = sprintf '%02d:00', $hour;
-%     my $selected = $formatted eq $fields{'Hour'}
-%                  ? 'selected="selected"'
-%                  : '';
-
-    <option value="<% $formatted %>" <%$selected%>><% $formatted %></option>
-% }
-</select>
-(in <%$timezone%>)
-</td></tr>
-<tr><td class="label">
 <&|/l&>Frequency</&>:
 </td><td class="value">
 <input type="radio" name="Frequency" value="daily" <% $fields{'Frequency'} eq 'daily' ? 'checked="checked"' : "" %>>
@@ -135,7 +120,27 @@
     <option value="<% $dom %>" <% $fields{'Dom'} == $dom ? 'selected="selected"' : '' %>><% loc($dom) %></option>
 %   }
 </select>
+<br />
 
+<input type="radio" name="Frequency" value="never" <% $fields{'Frequency'} eq 'never' ? 'checked="checked"' : "" %>>
+    never
+</input>
+
+</td></tr>
+<tr><td class="label">
+<&|/l&>Hour</&>:
+</td><td class="value">
+<select name="Hour">
+% for my $hour (0..23) {
+%     my $formatted = sprintf '%02d:00', $hour;
+%     my $selected = $formatted eq $fields{'Hour'}
+%                  ? 'selected="selected"'
+%                  : '';
+
+    <option value="<% $formatted %>" <%$selected%>><% $formatted %></option>
+% }
+</select>
+(in <%$timezone%>)
 </td></tr>
 <tr><td class="label">
 <&|/l&>Rows</&>: