mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-05-28 06:32:32 +02:00
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. Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
parent
2c74a1b4ae
commit
f1cd8f5e2f
@ -22921,3 +22921,6 @@
|
||||
* Documented the 'TempDirectory=' directive in 'conf/rd.conf-sample'.
|
||||
2022-03-02 Fred Gleason <fredg@paravelsystems.com>
|
||||
* 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.
|
||||
|
@ -2,7 +2,7 @@
|
||||
//
|
||||
// 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
|
||||
// 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:
|
||||
filter_service_box->insertItem(filter_service_box->count(),tr("ALL"));
|
||||
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);
|
||||
while(q->next()) {
|
||||
filter_service_box->
|
||||
@ -163,7 +164,8 @@ void RDLogFilter::changeUser()
|
||||
filter_service_box->clear();
|
||||
filter_service_box->insertItem(filter_service_box->count(),tr("ALL"));
|
||||
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);
|
||||
while(q->next()) {
|
||||
filter_service_box->
|
||||
|
Loading…
x
Reference in New Issue
Block a user