Fix calendar active checkbox

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 77a75c14b2e937e9081432c1bf24f9a882a72dce..5864977eb38c0145d832ae9126a53f5c6c7c5eba 100644 (file)
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -464,7 +464,7 @@ Calendar={
                        },
                        submit:function(button, calendarid){
                                var displayname = $("#displayname_"+calendarid).val();
-                               var active = $("#active_"+calendarid+":checked").length;
+                               var active = $("#edit_active_"+calendarid+":checked").length;
                                var description = $("#description_"+calendarid).val();
                                var calendarcolor = $("#calendarcolor_"+calendarid).val();
 

diff --git a/apps/calendar/templates/part.editcalendar.php b/apps/calendar/templates/part.editcalendar.php
index a1a36505ee9dd0419962cab50cede754c42dbf5e..af55514912096fb265a1bc75e2091b24cd8593bf 100644 (file)
--- a/apps/calendar/templates/part.editcalendar.php
+++ b/apps/calendar/templates/part.editcalendar.php
@@ -25,8 +25,8 @@
 <tr>
        <td></td>
        <td>
-               <input id="active_<?php echo $_['calendar']['id'] ?>" type="checkbox"<?php echo $_['calendar']['active'] ? ' checked="checked"' : '' ?>>
-               <label for="active_<?php echo $_['calendar']['id'] ?>">
+               <input id="edit_active_<?php echo $_['calendar']['id'] ?>" type="checkbox"<?php echo $_['calendar']['active'] ? ' checked="checked"' : '' ?>>
+               <label for="edit_active_<?php echo $_['calendar']['id'] ?>">
                        <?php echo $l->t('Active') ?>
                </label>
        </td>