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

2021-01-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdlibrary(1) that caused a SQL error to be generated
	when neither audio nor macro carts were selected in the cart filter.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-01-14 18:11:47 -05:00
parent 2934b80f26
commit aa41ce2f84
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20788,3 +20788,6 @@
* Reenabled cart dragging in rdlibrary(1). * Reenabled cart dragging in rdlibrary(1).
2021-01-14 Fred Gleason <fredg@paravelsystems.com> 2021-01-14 Fred Gleason <fredg@paravelsystems.com>
* Purged unneeded data structures in rdlibrary(1). * Purged unneeded data structures in rdlibrary(1).
2021-01-14 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlibrary(1) that caused a SQL error to be generated
when neither audio nor macro carts were selected in the cart filter.

16
lib/rdcartfilter.cpp
View File

@ -226,6 +226,10 @@ QString RDCartFilter::filterSql(const QStringList &and_fields) const
QString sql=""; QString sql="";
QString type_filter=GetTypeFilter(); QString type_filter=GetTypeFilter();
if(type_filter.isEmpty()) {
return QString("where CART.NUMBER=0 ");
}
QStringList schedcodes; QStringList schedcodes;
if(d_codes_box->currentText()!=tr("ALL")) { if(d_codes_box->currentText()!=tr("ALL")) {
schedcodes << d_codes_box->currentText(); schedcodes << d_codes_box->currentText();
@ -235,11 +239,11 @@ QString RDCartFilter::filterSql(const QStringList &and_fields) const
} }
if(d_group_box->currentText()==QString(tr("ALL"))) { if(d_group_box->currentText()==QString(tr("ALL"))) {
sql=RDAllCartSearchText(d_filter_edit->text(),schedcodes, sql=RDAllCartSearchText(d_filter_edit->text(),schedcodes,
rda->user()->name(),true)+" && "+type_filter; rda->user()->name(),true)+" "+type_filter;
} }
else { else {
sql=RDCartSearchText(d_filter_edit->text(),d_group_box->currentText(), sql=RDCartSearchText(d_filter_edit->text(),d_group_box->currentText(),
schedcodes,true)+" && "+type_filter; schedcodes,true)+" "+type_filter;
} }
for(int i=0;i<and_fields.size();i++) { for(int i=0;i<and_fields.size();i++) {
sql+="&& "+and_fields.at(i)+" "; sql+="&& "+and_fields.at(i)+" ";
@ -250,6 +254,8 @@ QString RDCartFilter::filterSql(const QStringList &and_fields) const
sql+=QString().sprintf("limit %d ",RD_LIMITED_CART_SEARCH_QUANTITY); sql+=QString().sprintf("limit %d ",RD_LIMITED_CART_SEARCH_QUANTITY);
} }
// printf("SQL: %s\n",sql.toUtf8().constData());
return sql; return sql;
} }
@ -432,15 +438,15 @@ QString RDCartFilter::GetTypeFilter() const
if(d_showaudio_box->isChecked()) { if(d_showaudio_box->isChecked()) {
if(d_showmacro_box->isChecked()) { if(d_showmacro_box->isChecked()) {
type_filter="((TYPE=1)||(TYPE=2)||(TYPE=3))"; type_filter="&& ((TYPE=1)||(TYPE=2)||(TYPE=3))";
} }
else { else {
type_filter="((TYPE=1)||(TYPE=3))"; type_filter="&& ((TYPE=1)||(TYPE=3))";
} }
} }
else { else {
if(d_showmacro_box->isChecked()) { if(d_showmacro_box->isChecked()) {
type_filter="(TYPE=2)"; type_filter="&& (TYPE=2)";
} }
} }
return type_filter; return type_filter;