diff --git a/CHANGES.rst b/CHANGES.rst index c1540d0..f279339 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,12 @@ Changelog 2.3.4 (unreleased) ------------------ +- solgemafullcalendar.js is got from portal_url, not from context url + [thomasdesvenain] + +- More robust way to generate add event view. + [thomasdesvenain] + - For an IATFolder, the search path is the folder itself, not the target_folder. [sgeulette, anuyens] diff --git a/Solgema/fullcalendar/skins/solgemafullcalendar/solgemafullcalendar.js b/Solgema/fullcalendar/skins/solgemafullcalendar/solgemafullcalendar.js index 0411f7d..7993903 100644 --- a/Solgema/fullcalendar/skins/solgemafullcalendar/solgemafullcalendar.js +++ b/Solgema/fullcalendar/skins/solgemafullcalendar/solgemafullcalendar.js @@ -301,13 +301,14 @@ var SolgemaFullcalendar = { }, openAddMenu: function (start, end, allDay, event, view) { if(SolgemaFullcalendarVars.disableAJAX) { return; } + var url = jq('base').attr('href') + '/@@SFDisplayAddMenu'; jq.ajax({ - type : 'POST', - url : './@@SFDisplayAddMenu', + type : 'POST', + url : url, dataType: "json", - async: true, - data : {}, - success : function(msg) { + async: true, + data : {}, + success : function(msg) { if (msg['display']) { var data = new Object; var startMonth = start.getMonth()+1;