mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-10 16:43:35 +02:00
2017-11-08 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the 'RDLogFilter' widget that caused excluded services to be included when specifying a filter string.
This commit is contained in:
@@ -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",
|
||||
|
Reference in New Issue
Block a user