Fix period selector on default reminder settings

docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.6.3 (Unreleased)
+---------------------
+- Enh #466: Fix period selector on default reminder settings
+
 1.6.2 (July 16, 2024)
 ---------------------
 - Enh #495: Fix column `exdate` to delete more than 16 recurrence event entries

models/reminder/forms/ReminderSettings.php

@@ -62,7 +62,9 @@ public function init()
     protected function initReminders()
     {
         $this->reminders = $this->loadReminder();
-        $this->reminders[] = new CalendarReminder();
+        if (count($this->reminders) < $this->getMaxReminders()) {
+            $this->reminders[] = new CalendarReminder();
+        }
     }
 
     protected function loadReminder($defaults = true)
@@ -231,7 +233,9 @@ public function save()
             $this->initReminder(1)->save();
         }
 
-        $this->reminders[] = new CalendarReminder();
+        if (count($this->reminders) < $this->getMaxReminders()) {
+            $this->reminders[] = new CalendarReminder();
+        }
 
         if($this->isGlobalSettings() || $this->isContainerLevelSettings()) {
             CalendarReminder::flushDefautlts();

module.json

@@ -3,7 +3,7 @@
     "name": "Calendar",
     "description": "Create one-time or recurring events, invite and manage attendees, and keep track of all your events with the Calendar module.",
     "keywords": ["calendar"],
-    "version": "1.6.2",
+    "version": "1.6.3",
     "humhub": {
         "minVersion": "1.16.1"
     },

resources/js/humhub.calendar.reminder.Form.js

@@ -7,30 +7,38 @@
 humhub.module('calendar.reminder.Form', function (module, require, $) {
     var Widget = require('ui.widget').Widget;
     var client = require('client');
+    var additions = require('ui.additions');
 
     var SELECTOR_ITEMS = '.calendar-reminder-items';
+    var SELECTOR_ITEM = '[data-reminder-index]';
     var SELECTOR_DEFAULT_ITEMS = '.calendar-reminder-item-defaults';
-    var SELECTOR_USE_DEFAULT_CHECKBOX = '#remindersettings-usedefaults';
     var SELECTOR_REMINDER_TYPE_DROPDOWN = '#remindersettings-remindertype';
-    var SELECTOR_ADD_BUTTON = '.btn-primary[data-action-click="add"]';
+    var SELECTOR_BUTTON = '[data-action-click]';
 
     var REMINDER_TYPE_NONE = 0;
     var REMINDER_TYPE_DEFAULTS = 1;
     var REMINDER_TYPE_CUSTOM = 2;
 
     var Form = Widget.extend();
 
-    Form.prototype.init = function(evt) {
+    Form.prototype.init = function() {
         this.checkMaxReminder();
         this.checkRemidnerType();
     };
 
     Form.prototype.checkMaxReminder = function() {
-        var count = this.$.find(SELECTOR_ITEMS).find('[data-reminder-index]').length;
-        if(count >= this.options.maxReminder) {
-            this.$.find(SELECTOR_ADD_BUTTON).hide();
-        } else {
-            this.$.find(SELECTOR_ADD_BUTTON).show();
+        var rows = this.$.find(SELECTOR_ITEM);
+
+        this.$.find(SELECTOR_BUTTON).data('action-click', 'delete')
+            .removeClass('btn-primary').addClass('btn-danger')
+            .find('i')
+            .removeClass('fa-plus').addClass('fa-times');
+
+        if (rows.length < this.options.maxReminder) {
+            rows.last().find(SELECTOR_BUTTON).data('action-click', 'add')
+                .removeClass('btn-danger').addClass('btn-primary')
+                .find('i')
+                .removeClass('fa-times').addClass('fa-plus');
         }
     };
 
@@ -64,19 +72,16 @@ humhub.module('calendar.reminder.Form', function (module, require, $) {
         var $newRow = $triggerRow.clone().attr('data-reminder-index', ++$lastIndex);
 
         $newRow.find('[name]').each(function() {
-            var name = $(this).attr('name').replace(/CalendarReminder\[[0-9]]/, 'CalendarReminder['+$lastIndex+']');
-            $(this).attr('name', name);
+            $(this).attr('name', $(this).attr('name').replace(/^CalendarReminder\[\d]/, 'CalendarReminder[' + $lastIndex + ']'));
         });
+        $newRow.find('[id]').each(function() {
+            $(this).attr('id', $(this).attr('id').replace(/^calendarreminder-\d/, 'calendarreminder-' + $lastIndex));
+        });
+        $newRow.find('.select2-container').remove();
+        additions.applyTo($newRow);
 
         $newRow.insertAfter($triggerRow);
 
-        evt.$trigger.data('action-click', 'delete')
-            .removeClass('btn-primary')
-            .addClass('btn-danger')
-            .find('i')
-            .removeClass('fa-plus')
-            .addClass('fa-times');
-
         this.checkMaxReminder();
     };
 
@@ -92,4 +97,4 @@ humhub.module('calendar.reminder.Form', function (module, require, $) {
 
 
     module.export = Form;
-});
+});