From b37bd08ca7241819d2e7cf9e0bcc43ff0bca45b4 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 8 Nov 2017 10:31:56 -0500 Subject: [PATCH] 2017-11-08 Fred Gleason * Fixed a bug in the 'RDLogFilter' widget that caused excluded services to be included when specifying a filter string. --- ChangeLog | 3 +++ lib/rdlogfilter.cpp | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 970f3b0d..23a1799b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16339,3 +16339,6 @@ 2017-11-08 Fred Gleason * Added 'FILTER' and 'RECENT' call parameters to the 'ListLogs' Web API call. +2017-11-08 Fred Gleason + * Fixed a bug in the 'RDLogFilter' widget that caused excluded + services to be included when specifying a filter string. diff --git a/lib/rdlogfilter.cpp b/lib/rdlogfilter.cpp index 002d8579..1f7b734c 100644 --- a/lib/rdlogfilter.cpp +++ b/lib/rdlogfilter.cpp @@ -103,9 +103,15 @@ RDLogFilter::RDLogFilter(QWidget *parent) } QString filter=filter_filter_edit->text(); if(!filter.isEmpty()) { - sql+="&&((LOGS.NAME like \"%%"+RDEscapeString(filter)+"%%\")||"; - sql+="(LOGS.DESCRIPTION like \"%%"+RDEscapeString(filter)+"%%\")||"; - sql+="(LOGS.SERVICE like \"%%"+RDEscapeString(filter)+"%%\"))"; + if(filter_service_box->currentItem()==0) { + sql+="&&((LOGS.NAME like \"%%"+RDEscapeString(filter)+"%%\")||"; + sql+="(LOGS.DESCRIPTION like \"%%"+RDEscapeString(filter)+"%%\")||"; + sql+="(LOGS.SERVICE like \"%%"+RDEscapeString(filter)+"%%\"))"; + } + else { + sql+="&&((LOGS.NAME like \"%%"+RDEscapeString(filter)+"%%\")||"; + sql+="(LOGS.DESCRIPTION like \"%%"+RDEscapeString(filter)+"%%\"))"; + } } if(filter_recent_check->isChecked()) { sql+=QString().sprintf("order by LOGS.ORIGIN_DATETIME desc limit %d",