Merge branch 'spidev' into 'master'

Kalender

See merge request fronk/thetool!786

public/js/pages/Calendar/View.js

@@ -505,8 +505,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
                                 $('#calendar-attendees').val(attendees).trigger('change');
                             }
-                            if (info.event.extendedProps.rruleflag==true)
-                            {
+                            if (info.event.extendedProps.rruleflag == true) {
                                 $('#delete-event').hide();
                                 $('#update-event').hide();
                                 $('.show-attendee').hide();
@@ -1335,17 +1334,6 @@ $(document).ready(function () {
         var txtcolors = [];
         var calendar_id = [];
         var thisis = $(this);
-        if (init === 0) {
-            var resourceA = calendar.getResourceById(thisis.data('calendar_id'));
-            if (resourceA) {
-                var events = resourceA.getEvents();
-                events.forEach(function (event) {
-                    event.setProp('backgroundColor', thisis.closest('div').find('.color-input').val());
-                    event.setProp('textColor', thisis.closest('div').find('.color-text-input').val());
-                });
-            }
-            calendar.render();
-        }
         $.each($('.color-input'), function (index, value) {
             if ($(this).data('calendar_id')) {
                 bgcolors.push($(this).closest('div').find('.color-input').val());
@@ -1367,6 +1355,10 @@ $(document).ready(function () {
             groups: groups
         }, function (data) {
 
+        }).done(function (data) {
+            if (init === 0) {
+                refreshCalendarEvents();
+            }
         })
     });
     $('body').on('change', '.calendar-check', function (event, init = 0) {