From ff1c4c9a65971033f085957ea4c4c8c6f3786005 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 20 Aug 2021 16:02:00 +0530
Subject: [PATCH] update the calendar list when calendar removal is successful

also fall back to team.name when team.displayName is not available
---
 www/calendar/inner.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index 21cb12789..a1fd8c8e8 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -566,7 +566,7 @@ define([
                 attributes: {
                     'class': 'fa fa-trash-o',
                 },
-                content: h('span', Messages.kanban_delete),
+                content: h('span', Messages.kanban_delete), // XXX delete key is misleading... "Remove" ? `poll_remove`, `fc_remove`
                 action: function (e) {
                     e.stopPropagation();
                     var cal = APP.calendars[id];
@@ -586,8 +586,9 @@ define([
                         }, function (err) {
                             if (err) {
                                 console.error(err);
-                                UI.warn(Messages.error);
+                                return void UI.warn(Messages.error);
                             }
+                            renderCalendar();
                         });
                     });
                 }
@@ -722,7 +723,7 @@ define([
                 if (!calendars.length) { return; }
                 var team = privateData.teams[teamId];
                 var avatar = h('span.cp-avatar');
-                common.displayAvatar($(avatar), team.avatar, team.displayName);
+                common.displayAvatar($(avatar), team.avatar, team.displayName || team.name);
                 APP.$calendars.append(h('div.cp-calendar-team', [
                     avatar,
                     h('span.cp-name', {title: team.name}, team.name)