@@ -419,24 +419,22 @@ def _rest_getDecidedMeetingDate(self,
419
419
It returns a datetime object if a meeting has been found, or None otherwise.
420
420
TODO: handle decided_states correctly, fetching decided states from PloneMeeting configuration
421
421
"""
422
- brains = self ._rest_searchItems (data )
423
- if not brains :
422
+ query = {
423
+ 'extra_include' : 'meeting,linked_items' ,
424
+ 'extra_include_linked_items_mode' : 'every_successors' ,
425
+ 'extra_include_linked_items_extra_include' : 'meeting' ,
426
+ }
427
+ query .update (data )
428
+ items = self ._rest_searchItems (query )
429
+ if not items :
424
430
return # Item has been deleted or has not been sent to PloneMeeting
425
- item = self ._rest_getItemInfos (
426
- {"UID" : brains [0 ]['UID' ], "showExtraInfos" : True ,
427
- 'extra_include' : 'meeting,linked_items' ,
428
- 'extra_include_meeting_additional_values' : '*' ,
429
- 'extra_include_linked_items_mode' : 'every_successors' }
430
- )[0 ]
431
+ item = items [0 ]
431
432
if item_portal_type == item ["@type" ] and item ['review_state' ] in decided_states :
432
433
return datetime .strptime (item ['extra_include_meeting' ]['date' ], "%Y-%m-%dT%H:%M:%S" )
433
434
elif item ['extra_include_linked_items' ]:
434
435
for linked_item in item ['extra_include_linked_items' ]:
435
436
if item_portal_type == linked_item ["@type" ] and linked_item ['review_state' ] in decided_states :
436
- item = self ._rest_getItemInfos (
437
- {"UID" : linked_item ['UID' ], "showExtraInfos" : True , 'extra_include' : 'meeting' }
438
- )[0 ]
439
- return datetime .strptime (item ['extra_include_meeting' ]['date' ], "%Y-%m-%dT%H:%M:%S" )
437
+ return datetime .strptime (linked_item ['extra_include_meeting' ]['date' ], "%Y-%m-%dT%H:%M:%S" )
440
438
441
439
442
440
def _rest_getItemTemplate (self , data ):
0 commit comments