Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-29 15:12:34 +02:00
Code Issues Projects Releases Wiki Activity

2022-03-02 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in the log filter widget that caused entries in the
	'Services' dropdown be listed in non-alphabetical order.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-03-02 13:51:55 -05:00
parent 2c74a1b4ae
commit f1cd8f5e2f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -22921,3 +22921,6 @@
* Documented the 'TempDirectory=' directive in 'conf/rd.conf-sample'. * Documented the 'TempDirectory=' directive in 'conf/rd.conf-sample'.
2022-03-02 Fred Gleason <fredg@paravelsystems.com> 2022-03-02 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdcatch(1) that broke play-out events. * Fixed a regression in rdcatch(1) that broke play-out events.
2022-03-02 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the log filter widget that caused entries in the
'Services' dropdown be listed in non-alphabetical order.

8
lib/rdlogfilter.cpp
View File

@ -2,7 +2,7 @@
// //
// Filter widget for picking Rivendell logs. // Filter widget for picking Rivendell logs.
// //
// (C) Copyright 2017-2021 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2017-2022 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -62,7 +62,8 @@ RDLogFilter::RDLogFilter(RDLogFilter::FilterMode mode,QWidget *parent)
case RDLogFilter::StationFilter: case RDLogFilter::StationFilter:
filter_service_box->insertItem(filter_service_box->count(),tr("ALL")); filter_service_box->insertItem(filter_service_box->count(),tr("ALL"));
sql=QString("select SERVICE_NAME from SERVICE_PERMS where ")+ sql=QString("select SERVICE_NAME from SERVICE_PERMS where ")+
"STATION_NAME=\""+RDEscapeString(rda->config()->stationName())+"\""; "STATION_NAME='"+RDEscapeString(rda->config()->stationName())+"' "+
"order by `SERVICE_NAME`";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
filter_service_box-> filter_service_box->
@ -163,7 +164,8 @@ void RDLogFilter::changeUser()
filter_service_box->clear(); filter_service_box->clear();
filter_service_box->insertItem(filter_service_box->count(),tr("ALL")); filter_service_box->insertItem(filter_service_box->count(),tr("ALL"));
QString sql=QString("select `SERVICE_NAME` from `USER_SERVICE_PERMS` where ")+ QString sql=QString("select `SERVICE_NAME` from `USER_SERVICE_PERMS` where ")+
"`USER_NAME`='"+RDEscapeString(rda->user()->name())+"'"; "`USER_NAME`='"+RDEscapeString(rda->user()->name())+"' "+
"order by `SERVICE_NAME`";
RDSqlQuery *q=new RDSqlQuery(sql); RDSqlQuery *q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
filter_service_box-> filter_service_box->