Skip to content

Commit 2ec0943

Browse files
committed
[spalenque] - #14596 * add search by email in summit admin speaker list
1 parent a3e1aaa commit 2ec0943

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

summit/code/infrastructure/repositories/SapphirePresentationSpeakerRepository.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,8 @@ private function buildSearchSpeakersBaseCountSQLQuery($where){
428428
SELECT COUNT(FullName) AS QTY FROM
429429
(
430430
SELECT
431-
IFNULL(CONCAT(PresentationSpeaker.FirstName,' ', PresentationSpeaker.LastName), CONCAT(Member.FirstName,' ', Member.Surname)) AS FullName
431+
IFNULL(CONCAT(PresentationSpeaker.FirstName,' ', PresentationSpeaker.LastName), CONCAT(Member.FirstName,' ', Member.Surname)) AS FullName,
432+
IFNULL(Member.Email, SpeakerRegistrationRequest.Email) AS Email
432433
FROM PresentationSpeaker
433434
LEFT JOIN Member ON Member.ID = PresentationSpeaker.MemberID
434435
LEFT JOIN SpeakerRegistrationRequest ON SpeakerRegistrationRequest.SpeakerID = PresentationSpeaker.ID
@@ -665,6 +666,7 @@ public function searchByTermPaginated($page= 1, $page_size = 10, $term = '', $so
665666

666667
list($offset, $sort, $where_having) = $this->buildSpeakersSearchParams($page, $page_size, $term, $sort_by, $sort_dir);
667668

669+
$where_having .= " OR Email LIKE '{$term}%'";
668670
$query_count = $this->buildSearchSpeakersBaseCountSQLQuery($where_having);
669671
$query = $this->buildSearchSpeakersBaseSQLQuery($where_having, $sort, $offset, $page_size);
670672

summit/ui/source/js/admin/speakers/speakers-list.tag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="row">
88
<div class="col-md-6" style="margin:0 0 20px 0;">
99
<div class="input-group" style="width: 100%;">
10-
<input data-rule-required="true" data-rule-minlength="3" type="text" id="speakers_search_term" class="form-control input-global-search" placeholder="Search by Name">
10+
<input data-rule-required="true" data-rule-minlength="3" type="text" id="speakers_search_term" class="form-control input-global-search" placeholder="Search by Name or Email">
1111
<span class="input-group-btn" style="width: 5%;">
1212
<button class="btn btn-default btn-global-search" id="search_speakers"><i class="fa fa-search"></i></button>
1313
<button class="btn btn-default btn-global-search-clear" onclick="{ clearClicked }">

0 commit comments

Comments
 (0)