From 27eb4ee10d467e00b91b87f41175b786f4caf834 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Mon, 20 Jun 2016 14:40:29 -0400
Subject: [PATCH] Fixed problem with all/none not being detected as a change
 and therefore recurrence not being stored.

---
 views/admin/events/edit.html         |  6 ++++++
 views/admin/events/editSchedule.html | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/views/admin/events/edit.html b/views/admin/events/edit.html
index 7d9aeeb..b60e9a3 100644
--- a/views/admin/events/edit.html
+++ b/views/admin/events/edit.html
@@ -540,10 +540,16 @@
                 $('.glm-set-all').click( function() {
                    tableID = $(this).attr('data-id');
                    $('#' + tableID + ' input:checkbox').attr('checked', true);
+                   recurID = $(this).attr('data-recur-id');
+                   $('#' + recurID + '_recurUpdated').val(recurID);
+                   glmPageUpdateRequired();
                 });
                 $('.glm-set-none').click( function() {
                     tableID = $(this).attr('data-id');
                     $('#' + tableID + ' input:checkbox').attr('checked', false);
+                    recurID = $(this).attr('data-recur-id');
+                    $('#' + recurID + '_recurUpdated').val(recurID);
+                    glmPageUpdateRequired();
                  });
                 
                 initDateDelete();                
diff --git a/views/admin/events/editSchedule.html b/views/admin/events/editSchedule.html
index b0dee33..732310c 100644
--- a/views/admin/events/editSchedule.html
+++ b/views/admin/events/editSchedule.html
@@ -87,7 +87,7 @@
                             {/if}
                                                 <td style="white-space: nowrap;"><input data-id="{$r.id}" type="checkbox" name="Recur{$r.id}_month_of_year[{$v.value}]" value="{$v.value}" class="recurrence-input"{if $v.default} checked{/if}> {$v.name}&nbsp;&nbsp;</td>
                         {/foreach}
-                                                <td>&nbsp;&nbsp;<div data-id="monthOfYearTable_{$r.id}" class="button glm-button-small glm-set-all">All</div><div data-id="monthOfYearTable_{$r.id}" class="button glm-button-small glm-set-none">None</div></td>
+                                                <td>&nbsp;&nbsp;<div data-id="monthOfYearTable_{$r.id}" data-recur-id="{$r.id}" class="button glm-button-small glm-set-all">All</div><div data-id="monthOfYearTable_{$r.id}" data-recur-id="{$r.id}" class="button glm-button-small glm-set-none">None</div></td>
                                             </tr>
                                         </table>
                                     </td>
@@ -107,7 +107,7 @@
                         {foreach $r.week_of_month.bitmap as $v}
                                                 <td style="white-space: nowrap;"><input data-id="{$r.id}" type="checkbox" name="Recur{$r.id}_week_of_month[{$v.value}]" value="{$v.value}" class="recurrence-input"{if $v.default} checked{/if}> {$v.name}&nbsp;&nbsp;</td>
                         {/foreach}
-                                                <td>&nbsp;&nbsp;<div data-id="weekOfMonthTable_{$r.id}" class="button glm-button-small glm-set-all">All</div><div data-id="weekOfMonthTable_{$r.id}" class="button glm-button-small glm-set-none">None</div></td>
+                                                <td>&nbsp;&nbsp;<div data-id="weekOfMonthTable_{$r.id}" data-recur-id="{$r.id}" class="button glm-button-small glm-set-all">All</div><div data-id="weekOfMonthTable_{$r.id}" data-recur-id="{$r.id}" class="button glm-button-small glm-set-none">None</div></td>
                                             </tr>
                                         </table>
                                     </td>
@@ -120,7 +120,7 @@
                         {foreach $r.day_of_week.bitmap as $v}
                                                 <td style="white-space: nowrap;"><input data-id="{$r.id}" type="checkbox" name="Recur{$r.id}_day_of_week[{$v.value}]" value="{$v.value}" class="recurrence-input"{if $v.default} checked{/if}> {$v.name}</td>
                         {/foreach}
-                                                <td>&nbsp;&nbsp;<div data-id="dayOfWeekTable_{$r.id}" class="button glm-button-small glm-set-all">All</div><div data-id="dayOfWeekTable_{$r.id}" class="button glm-button-small glm-set-none">None</div></td>
+                                                <td>&nbsp;&nbsp;<div data-id="dayOfWeekTable_{$r.id}" data-recur-id="{$r.id}" class="button glm-button-small glm-set-all">All</div><div data-id="dayOfWeekTable_{$r.id}" data-recur-id="{$r.id}" class="button glm-button-small glm-set-none">None</div></td>
                                             </tr>
                                         </table>
                                     </td>
@@ -141,7 +141,7 @@
                                                 <td colspan="3" style="text-align: center;">
                                                     <input data-id="{$r.id}" type="checkbox" name="Recur{$r.id}_last_day_of_month" class="recurrence-input"{if $r.last_day_of_month.value} checked{/if}> Last day of the month
                                                 </td>
-                                                <td><div data-id="dayOfMonthTable_{$r.id}" class="button glm-button-small glm-set-all">All</div><div data-id="dayOfMonthTable_{$r.id}" class="button glm-button-small glm-set-none">None</div></td>
+                                                <td><div data-id="dayOfMonthTable_{$r.id}" data-recur-id="{$r.id}" class="button glm-button-small glm-set-all">All</div><div data-id="dayOfMonthTable_{$r.id}" data-recur-id="{$r.id}" class="button glm-button-small glm-set-none">None</div></td>
                                             </tr>
                                         </table>
                                     </td>
@@ -273,7 +273,7 @@
                 {/if}
                                     <td style="white-space: nowrap;"><input type="checkbox" name="{ newRecurID }_month_of_year[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}&nbsp;&nbsp;</td>
             {/foreach}
-                                    <td>&nbsp;&nbsp;<div data-id="monthOfYearTable_{ newRecurID }" class="button glm-button-small glm-set-all">All</div><div data-id="monthOfYearTable_{ newRecurID }" class="button glm-button-small glm-set-none">None</div></td>
+                                    <td>&nbsp;&nbsp;<div data-id="monthOfYearTable_{ newRecurID }" data-recur-id="{ newRecurID }" class="button glm-button-small glm-set-all">All</div><div data-id="monthOfYearTable_{ newRecurID }" data-recur-id="{ newRecurID }" class="button glm-button-small glm-set-none">None</div></td>
                                 </tr>
                             </table>
                         </td>
@@ -293,7 +293,7 @@
             {foreach $newRecurrence.fieldData.week_of_month.bitmap as $v}
                                     <td style="white-space: nowrap;"><input type="checkbox" name="{ newRecurID }_week_of_month[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}&nbsp;&nbsp;</td>
             {/foreach}
-                                    <td>&nbsp;&nbsp;<div data-id="weekOfMonthTable_{ newRecurID }" class="button glm-button-small glm-set-all">All</div><div data-id="weekOfMonthTable_{ newRecurID }" class="button glm-button-small glm-set-none">None</div></td>
+                                    <td>&nbsp;&nbsp;<div data-id="weekOfMonthTable_{ newRecurID }" data-recur-id="{ newRecurID }" class="button glm-button-small glm-set-all">All</div><div data-id="weekOfMonthTable_{ newRecurID }" data-recur-id="{ newRecurID }" class="button glm-button-small glm-set-none">None</div></td>
                                 </tr>
                             </table>
                         </td>
@@ -306,7 +306,7 @@
             {foreach $newRecurrence.fieldData.day_of_week.bitmap as $v}
                                     <td style="white-space: nowrap;"><input type="checkbox" name="{ newRecurID }_day_of_week[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}</td>
             {/foreach}
-                                    <td>&nbsp;&nbsp;<div data-id="dayOfWeekTable_{ newRecurID }" class="button glm-button-small glm-set-all">All</div><div data-id="dayOfWeekTable_{ newRecurID }" class="button glm-button-small glm-set-none">None</div></td>
+                                    <td>&nbsp;&nbsp;<div data-id="dayOfWeekTable_{ newRecurID }" data-recur-id="{ newRecurID }" class="button glm-button-small glm-set-all">All</div><div data-id="dayOfWeekTable_{ newRecurID }" data-recur-id="{ newRecurID }" class="button glm-button-small glm-set-none">None</div></td>
                                 </tr>
                             </table>
                         </td>
@@ -327,7 +327,7 @@
                                     <td colspan="3" style="text-align: center;">
                                         <input type="checkbox" name="{ newRecurID }_last_day_of_month"> Last day of the month
                                     </td>
-                                    <td><div data-id="dayOfMonthTable_{ newRecurID }" class="button glm-button-small glm-set-all">All</div><div data-id="dayOfMonthTable_{ newRecurID }" class="button glm-button-small glm-set-none">None</div></td>
+                                    <td><div data-id="dayOfMonthTable_{ newRecurID }" data-recur-id="{ newRecurID }" class="button glm-button-small glm-set-all">All</div><div data-id="dayOfMonthTable_{ newRecurID }" data-recur-id="{ newRecurID }" class="button glm-button-small glm-set-none">None</div></td>
                                 </tr>
                             </table>
                         </td>
-- 
2.17.1