Merge branch 'master' of github.com:tracim/tracim

tracim/tracim/public/_caldavzap/forms.js

@@ -1666,13 +1666,46 @@ function showEventForm(date, allDay, calEvent, jsEvent, mod, repeatOne, confirmR
 	var cals=globalResourceCalDAVList.sortedCollections;
 	var calendarObj = $('#event_calendar');
 	var calSelected = $('.resourceCalDAV_item.resourceCalDAV_item_selected').attr('data-id');
-		for(var i=0;i<cals.length;i++)
-		{
-			if(cals[i].uid!=undefined && ((calEvent!=null && calEvent.res_id==cals[i].uid) || (cals[i].makeLoaded && !cals[i].permissions_read_only )))
-			{
-				calendarObj.append(new Option(cals[i].displayValue,cals[i].uid));
-			}
-		}
+
+  var calendarsApiHasResponded = false
+	// begin custom code
+  $.ajax({
+    url: '/api/calendars/',
+    method: 'GET',
+    contentType: 'application/json'
+  }).done(function (data) {
+
+    var regExpUser = new RegExp('\/user\/')
+    var regExpWorkspace = new RegExp('\/workspace\/')
+
+    var user_or_workspace
+
+    for(var i=0;i<cals.length;i++)
+    {
+      if(cals[i].uid!=undefined && ((calEvent!=null && calEvent.res_id==cals[i].uid) || (cals[i].makeLoaded && !cals[i].permissions_read_only )))
+      {
+        var currentICS = parseInt(cals[i].displayValue.replace('.ics', ''))
+
+        if (regExpUser.test(cals[i].uid))
+          user_or_workspace = 'user'
+        else if (regExpWorkspace.test(cals[i].uid))
+          user_or_workspace = 'workspace'
+        else
+          user_or_workspace = 'fail'
+
+        var calName = ''
+        var calList_length = data.value_list.length
+        for (var j = 0; j < calList_length; j++) {
+          if (data.value_list[j].id === currentICS && data.value_list[j].type === user_or_workspace) {
+            calName = data.value_list[j].label
+          }
+        }
+
+        calendarObj.append(new Option(calName, cals[i].uid));
+      }
+    }
+    calendarsApiHasResponded = true
+  })
 
 	if(mod=='new')
 	{
@@ -2362,8 +2395,17 @@ function showEventForm(date, allDay, calEvent, jsEvent, mod, repeatOne, confirmR
 			$('#event_details_template').find('svg[data-type="select_icon"]').replaceWith($('<div>').append($(newSVG).clone()).html());
 		}
 		/*************************** END OF BAD HACKS SECTION ***************************/
-		if(calEvent.etag!='')
-			$('#event_calendar').val(calEvent.res_id);
+		if(calEvent.etag!='') {
+      var interval = window.setInterval(function () {
+        if (calendarsApiHasResponded === true) {
+          $('#event_calendar').val(calEvent.res_id);
+          stopInterval()
+        }
+      }, 500)
+      var stopInterval = function () {
+        window.clearInterval(interval)
+      }
+    }
 	}
 
 	if(repeatOne=='editOnly' || $('#recurrenceID').val()!='')