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

2021-04-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in 'RDCartFilter' that caused a SQL error when
	no groups were included in the search terms.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-26 10:16:40 -04:00
parent a1c4026a5f
commit c1cf7381bd
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -21604,3 +21604,6 @@
errors.
* Fixed typo in 'lib/rdlogmodel.cpp' that caused SQL
errors.
2021-04-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'RDCartFilter' that caused a SQL error when
no groups were included in the search terms.

7
lib/rdcartfilter.cpp
View File

@ -234,8 +234,13 @@ QString RDCartFilter::filterSql(const QStringList &and_fields) const
sql+=RDCartFilter::phraseFilter(d_filter_edit->text().trimmed(),true);
QStringList groups;
for(int i=0;i<d_group_box->count();i++) {
if(d_group_box->itemText(i)!=tr("ALL")) {
groups.push_back(d_group_box->itemText(i));
}
}
if(groups.size()==0) { // No groups selected, so force an empty selection
return QString(" where `CART`.`NUMBER`<0"); // An impossibility
}
sql+=RDCartFilter::groupFilter(d_group_box->currentText(),groups);
if(d_show_track_carts) {
sql=sql.left(sql.length()-2); // Remove the final "&&"
@ -340,6 +345,7 @@ QString RDCartFilter::service() const
void RDCartFilter::setService(const QString &svc)
{
if(svc!=d_service) {
d_service=svc;
if(!d_service.isEmpty()) {
@ -427,6 +433,7 @@ void RDCartFilter::setMatchCount(int matches)
void RDCartFilter::searchClickedData()
{
d_search_button->setDisabled(true);
if(d_filter_edit->text().isEmpty()) {
d_clear_button->setDisabled(true);