|
@@ -1666,13 +1666,44 @@ function showEventForm(date, allDay, calEvent, jsEvent, mod, repeatOne, confirmR
|
1666
|
1666
|
var cals=globalResourceCalDAVList.sortedCollections;
|
1667
|
1667
|
var calendarObj = $('#event_calendar');
|
1668
|
1668
|
var calSelected = $('.resourceCalDAV_item.resourceCalDAV_item_selected').attr('data-id');
|
1669
|
|
- for(var i=0;i<cals.length;i++)
|
1670
|
|
- {
|
1671
|
|
- if(cals[i].uid!=undefined && ((calEvent!=null && calEvent.res_id==cals[i].uid) || (cals[i].makeLoaded && !cals[i].permissions_read_only )))
|
1672
|
|
- {
|
1673
|
|
- calendarObj.append(new Option(cals[i].displayValue,cals[i].uid));
|
1674
|
|
- }
|
1675
|
|
- }
|
|
1669
|
+
|
|
1670
|
+ // begin custom code
|
|
1671
|
+ $.ajax({
|
|
1672
|
+ url: '/api/calendars/',
|
|
1673
|
+ method: 'GET',
|
|
1674
|
+ contentType: 'application/json'
|
|
1675
|
+ }).done(function (data) {
|
|
1676
|
+
|
|
1677
|
+ var regExpUser = new RegExp('\/user\/')
|
|
1678
|
+ var regExpWorkspace = new RegExp('\/workspace\/')
|
|
1679
|
+
|
|
1680
|
+ var user_or_workspace
|
|
1681
|
+
|
|
1682
|
+ for(var i=0;i<cals.length;i++)
|
|
1683
|
+ {
|
|
1684
|
+ if(cals[i].uid!=undefined && ((calEvent!=null && calEvent.res_id==cals[i].uid) || (cals[i].makeLoaded && !cals[i].permissions_read_only )))
|
|
1685
|
+ {
|
|
1686
|
+ var currentICS = parseInt(cals[i].displayValue.replace('.ics', ''))
|
|
1687
|
+
|
|
1688
|
+ if (regExpUser.test(cals[i].uid))
|
|
1689
|
+ user_or_workspace = 'user'
|
|
1690
|
+ else if (regExpWorkspace.test(cals[i].uid))
|
|
1691
|
+ user_or_workspace = 'workspace'
|
|
1692
|
+ else
|
|
1693
|
+ user_or_workspace = 'fail'
|
|
1694
|
+
|
|
1695
|
+ var calName = ''
|
|
1696
|
+ var calList_length = data.value_list.length
|
|
1697
|
+ for (var j = 0; j < calList_length; j++) {
|
|
1698
|
+ if (data.value_list[j].id === currentICS && data.value_list[j].type === user_or_workspace) {
|
|
1699
|
+ calName = data.value_list[j].label
|
|
1700
|
+ }
|
|
1701
|
+ }
|
|
1702
|
+
|
|
1703
|
+ calendarObj.append(new Option(calName, cals[i].uid));
|
|
1704
|
+ }
|
|
1705
|
+ }
|
|
1706
|
+ })
|
1676
|
1707
|
|
1677
|
1708
|
if(mod=='new')
|
1678
|
1709
|
{
|