Merge branch...

Merge branch '167-daily-planning-should-use-abbreviation-in-the-title-of-the-appointment-type-in-calendar-view' into 'master'

fix on disappearing title when removing appointment from daily planning

Closes #167

See merge request !83

smash/web/static/js/daily_planning.js

@@ -42,10 +42,14 @@ function add_event(event, color, subjectId, boxBody) {
         location = event.flying_team_location + ' (FT)';
         borderColor = FLYING_TEAM_BORDER_COLOR;
     }
+    var event_title = event.short_title;
+    if (event_title === undefined || event_title === "") {
+        event_title = event.title;
+    }
     eventElement.data('event', {
         appointment_start: event.appointment_start,
         appointment_end: event.appointment_end,
-        title: event.short_title,
+        title: event_title,
         stick: true,
         color: color + " !important",
         duration: event.duration,
@@ -117,6 +121,7 @@ function get_subjects_events(day) {
             boxHeader.append(title_subject);
             $.each(subject.events, function (index_event, event) {
                 if (event.link_when) {
+                    event.title = event.short_title;
                     event.color = subject.color + ' !important';
                     event.start = $.fullCalendar.moment(event.link_when);
                     event.end = $.fullCalendar.moment(event.link_end);