Skip to content

Commit a86685d

Browse files
committed
Feature GitHub:11200 (Fix)
1 parent 7f48afe commit a86685d

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

Project/Sources/Classes/Office365Calendar.4dm

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
Class extends _GraphAPI
22

3-
Class constructor($inProvider : cs.OAuth2Provider)
3+
property userId : Text
4+
5+
Class constructor($inProvider : cs.OAuth2Provider; $inParameters : Object)
46

57
Super($inProvider)
8+
This.userId:=(Length(String($inParameters.userId))>0) ? String($inParameters.userId) : ""
69

710

811
// Mark: - [Private]
@@ -17,10 +20,14 @@ Function getCalendar($inID : Text; $inSelect : Text) : Object
1720

1821
var $urlParams : Text:=""
1922

20-
If (Length(String($inID))>0)
21-
$urlParams:="users/"+String($inID)+"/calendar"
23+
If (Length(String(This.userId))>0)
24+
$urlParams:="users/"+This.userId
2225
Else
23-
$urlParams:="me/calendar"
26+
$urlParams:="me"
27+
End if
28+
$urlParams+="/calendar"
29+
If (Length(String($inID))>0)
30+
$urlParams:="/"+String($inID)
2431
End if
2532

2633
If (Length(String($inSelect))>0)
@@ -46,10 +53,10 @@ Function getCalendarList($inParameters : Object) : Object
4653
var $urlParams : Text:=""
4754
var $delimiter : Text:="?"
4855

49-
If (Length(String($inID))>0)
50-
$urlParams:="users/"+String($inID)+"/calendar"
56+
If (Length(String(This.userId))>0)
57+
$urlParams:="users/"+This.userId
5158
Else
52-
$urlParams:="me/calendar"
59+
$urlParams:="me"
5360
End if
5461

5562
If (Length(String($inParameters.search))>0)

0 commit comments

Comments
 (0)