2022-09-30 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug in 'RDCartFilter' that caused 'RDLibraryModel' to
	fail to be initialized properly.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2022-09-30 10:47:25 -04:00
parent 1496e3e17f
commit 02337abb32
2 changed files with 8 additions and 2 deletions

View File

@ -23442,3 +23442,6 @@
2022-09-30 Fred Gleason <fredg@paravelsystems.com> 2022-09-30 Fred Gleason <fredg@paravelsystems.com>
* Updated various dialogs in rdcatch(1) to use new 'pretty text' * Updated various dialogs in rdcatch(1) to use new 'pretty text'
styling for cart and cut objects. styling for cart and cut objects.
2022-09-30 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'RDCartFilter' that caused 'RDLibraryModel' to
fail to be initialized properly.

View File

@ -624,6 +624,10 @@ QString RDCartFilter::phraseFilter(const QString &phrase, bool incl_cuts)
QString RDCartFilter::groupFilter(const QString &group, QString RDCartFilter::groupFilter(const QString &group,
const QStringList &groups) const QStringList &groups)
{ {
if(groups.size()<=1) { // No actual groups included!
return QString("(`CART`.`NUMBER`<0) &&"); // Force empty selection
}
QString sql=" ("; QString sql=" (";
if(group==tr("ALL")) { if(group==tr("ALL")) {
@ -733,8 +737,7 @@ void RDCartFilter::LoadServiceGroups()
void RDCartFilter::UpdateModel() void RDCartFilter::UpdateModel()
{ {
if(isVisible()&& if((filterSql()!=d_model_filter_sql)||(cartLimit()!=d_model_cart_limit)) {
((filterSql()!=d_model_filter_sql)||(cartLimit()!=d_model_cart_limit))) {
d_model_filter_sql=filterSql(); d_model_filter_sql=filterSql();
d_model_cart_limit=cartLimit(); d_model_cart_limit=cartLimit();
emit filterChanged(d_model_filter_sql,d_model_cart_limit); emit filterChanged(d_model_filter_sql,d_model_cart_limit);