@@ -2710,15 +2710,16 @@ public function getAcceptedPresentations
2710
2710
if ($ filter ->hasFilter ("is_speaker " )){
2711
2711
$ value = to_boolean ($ filter ->getValue ("is_speaker " )[0 ]);
2712
2712
if ($ value )
2713
- $ extraWhere .= " AND spk.member = :member_id " ;
2713
+ $ extraWhere .= " AND ( spk.member = :member_id OR mod.member = :member_id) " ;
2714
2714
else
2715
- $ extraWhere .= " AND spk.member <> :member_id " ;
2715
+ $ extraWhere .= " AND ( ( spk.member <> :member_id OR spk.member IS NULL) AND (mod.member <> :member_id OR mod.member IS NULL) ) " ;
2716
2716
}
2717
2717
}
2718
2718
$ query = $ this ->createQuery (sprintf ("
2719
- SELECT p from models\summit\Presentation p
2719
+ SELECT DISTINCT p from models\summit\Presentation p
2720
2720
JOIN p.summit s
2721
2721
LEFT JOIN p.speakers a_spk
2722
+ LEFT JOIN p.moderator mod
2722
2723
LEFT JOIN a_spk.speaker spk
2723
2724
JOIN p.created_by cb
2724
2725
LEFT JOIN p.selection_plan sel_p
@@ -2904,15 +2905,16 @@ public function getAlternatePresentations
2904
2905
if ($ filter ->hasFilter ("is_speaker " )){
2905
2906
$ value = to_boolean ($ filter ->getValue ("is_speaker " )[0 ]);
2906
2907
if ($ value )
2907
- $ extraWhere .= " AND spk.member = :member_id " ;
2908
+ $ extraWhere .= " AND ( spk.member = :member_id OR mod.member = :member_id) " ;
2908
2909
else
2909
- $ extraWhere .= " AND spk.member <> :member_id " ;
2910
+ $ extraWhere .= " AND ( ( spk.member <> :member_id OR spk.member IS NULL) AND (mod.member <> :member_id OR mod.member IS NULL) ) " ;
2910
2911
}
2911
2912
}
2912
2913
2913
2914
$ query = $ this ->createQuery ("
2914
- SELECT p from models\summit\Presentation p
2915
+ SELECT DISTINCT p from models\summit\Presentation p
2915
2916
JOIN p.summit s
2917
+ LEFT JOIN p.moderator mod
2916
2918
LEFT JOIN p.speakers a_spk
2917
2919
LEFT JOIN a_spk.speaker spk
2918
2920
JOIN p.created_by cb
@@ -3060,14 +3062,15 @@ public function getRejectedPresentations
3060
3062
if ($ filter ->hasFilter ("is_speaker " )){
3061
3063
$ value = to_boolean ($ filter ->getValue ("is_speaker " )[0 ]);
3062
3064
if ($ value )
3063
- $ extraWhere .= " AND spk.member = :member_id " ;
3065
+ $ extraWhere .= " AND ( spk.member = :member_id OR mod.member = :member_id) " ;
3064
3066
else
3065
- $ extraWhere .= " AND spk.member <> :member_id " ;
3067
+ $ extraWhere .= " AND ( ( spk.member <> :member_id OR spk.member IS NULL) AND (mod.member <> :member_id OR mod.member IS NULL) ) " ;
3066
3068
}
3067
3069
}
3068
3070
3069
- $ query = $ this ->createQuery ("SELECT p from models\summit\Presentation p
3070
- JOIN p.summit s
3071
+ $ query = $ this ->createQuery ("SELECT DISTINCT p from models\summit\Presentation p
3072
+ JOIN p.summit s
3073
+ LEFT JOIN p.moderator mod
3071
3074
LEFT JOIN p.speakers a_spk
3072
3075
LEFT JOIN a_spk.speaker spk
3073
3076
LEFT JOIN p.materials m
0 commit comments