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

tracim/tracim/public/_caldavzap/resource.js

@@ -474,7 +474,7 @@ function ResourceCalDAVList()
 				newElement.find('input[type=checkbox]').attr('onclick','resourceChBoxClick(this, \'#\'+$(this).parent().parent().attr(\'id\'), \''+resHeader+'\', false);if(isCalDAVLoaded && $(this).parent().parent().attr(\'id\')== \'ResourceCalDAV'+todoString+'List\'){$(this).prop(\'checked\')?enableResourceTodo($(this).parent()):disableResourceTodo($(this).parent());}');
 
 			newElement.css('display', 'none');
-			newElement=newElement.parent().html();
+      newElement=newElement.parent().html();
 			$('#ResourceCalDAV'+todoString+'List').children().eq(insertIndex).after(newElement);
 		}
 
@@ -488,7 +488,40 @@ function ResourceCalDAVList()
 		if(globalCalDAVInitLoad)
 			newElement.addClass('r_operate');
 
-		newElement.html("<div class='resourceCalDAVColor' style='background:"+inputResource.ecolor+"'></div><input type='text' class='colorPicker'/><input type='checkbox' name="+inputResource.uid+" />"+$('<div/>').text(inputResource.displayvalue).html());
+    var uniqueIdForLabel = inputResource.displayvalue.replace('.', '') // remove the point so jquery doesn't consider it as 2 differents classes when used in a selector
+		newElement.html("\
+      <div class='resourceCalDAVColor' style='background:"+inputResource.ecolor+"'></div>\
+      <input type='text' class='colorPicker'/>\
+      <input type='checkbox' name="+inputResource.uid+" />\
+      <div class='"+uniqueIdForLabel+"' style='display:inline-block'>"+inputResource.displayvalue+"</div>");
+
+    // +$('<div/>').text(inputResource.displayvalue).html()); // legacy code
+    $.ajax({
+      url: '/api/calendars/',
+      method: 'GET',
+      contentType: 'application/json'
+    }).done(function (data) {
+      var currentICS = parseInt(inputResource.displayvalue.replace('.ics', ''))
+
+      var regExpUser = new RegExp('\/cal\/user\/')
+      var regExpWorkspace = new RegExp('\/cal\/workspace\/')
+
+      var user_or_workspace
+
+      if (regExpUser.test(inputResource.uid))
+        user_or_workspace = 'user'
+      else if (regExpWorkspace.test(inputResource.uid))
+        user_or_workspace = 'workspace'
+      else
+        user_or_workspace = 'fail'
+
+      // console.log('user_or_workspace : ', user_or_workspace, 'for : ', inputResource.uid)
+      // data.value_list.forEach((item) => item.id === currentICS && item.type === user_or_workspace && $('.'+uniqueIdForLabel).html(item.label)) // ES 6 approach
+      data.value_list.forEach(function (item) {
+        if (item.id === currentICS && item.type === user_or_workspace) $('.'+uniqueIdForLabel).html(item.label)
+      })
+    })
+
 		newElement.attr('title', $('<div/>').text(inputResource.displayvalue).html());
 		if(todoString=='')
 			newElement.find('input[type=checkbox]').attr({'data-id':inputResource.uid, 'onclick':'var evt = arguments[0];evt.stopPropagation();collectionChBoxClick(this, \'#\'+$(this).parent().parent().attr(\'id\'), \''+resHeader+'\', \''+resItem+'\', null, false);if(isCalDAVLoaded && $(this).parent().parent().attr(\'id\')== \'ResourceCalDAV'+todoString+'List\'){$(this).prop(\'checked\')?enableCalendar(\''+inputResource.uid+'\'):disableCalendar(\''+inputResource.uid+'\');}'});