From fdae332a36b0b9fc1f1fe7ba9ad85abaf26cb6b9 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Tue, 27 Oct 2020 07:30:22 +0100 Subject: [PATCH] Search po anketah isce tudi po internih naslovih (akronimih) --- admin/survey/classes/class.Library.php | 2 +- admin/survey/classes/class.SurveyList.php | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/admin/survey/classes/class.Library.php b/admin/survey/classes/class.Library.php index a7883aa8b..17db1d373 100644 --- a/admin/survey/classes/class.Library.php +++ b/admin/survey/classes/class.Library.php @@ -643,7 +643,7 @@ class Library { OR LOWER(sv.naslov) LIKE LOWER('".$search_text."'))"; // Search po naslovu else - $result = " AND LOWER(sa.naslov) LIKE LOWER('".$search_text."')"; + $result = " AND (LOWER(sa.naslov) LIKE LOWER('".$search_text."') OR LOWER(sa.akronim) LIKE LOWER('".$search_text."'))"; return $result; } diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php index 4d58a12e8..534081e00 100644 --- a/admin/survey/classes/class.SurveyList.php +++ b/admin/survey/classes/class.SurveyList.php @@ -2664,17 +2664,20 @@ class SurveyList { } // Search po avtorju - if($this->searchSettings['stype'] == '1') - $result = " AND (i_name LIKE '".$search_text."' OR i_surname LIKE '".$search_text."' OR i_email LIKE '".$search_text."')"; + if($this->searchSettings['stype'] == '1'){ + $result = " AND (i_name LIKE '".$search_text."' OR i_surname LIKE '".$search_text."' OR i_email LIKE '".$search_text."')"; + } // Search po kljucnih besedah znotraj vprasanj (naslovi vprasanj in vrednosti) - elseif($this->searchSettings['stype'] == '2') + elseif($this->searchSettings['stype'] == '2'){ $result = " AND (LOWER(introduction) LIKE LOWER('".$search_text."') OR LOWER(conclusion) LIKE LOWER('".$search_text."') OR LOWER(ss.naslov) LIKE LOWER('".$search_text."') - OR LOWER(sv.naslov) LIKE LOWER('".$search_text."'))"; + OR LOWER(sv.naslov) LIKE LOWER('".$search_text."'))"; + } // Search po naslovu - else - $result = " AND LOWER(sa.naslov) LIKE LOWER('".$search_text."')"; + else{ + $result = " AND (LOWER(sa.naslov) LIKE LOWER('".$search_text."') OR LOWER(sa.akronim) LIKE LOWER('".$search_text."'))"; + } // Search po statusu (aktivne, neaktivne) if($this->searchSettings['sstatus'] == '1')