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

resolved conflict in ChangeLog

Browse Source
This commit is contained in:
Fred Gleason 2016-04-26 16:44:35 -04:00
commit 2503c69ae5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -15090,3 +15090,6 @@
2016-04-26 Brian McGlynn <brian.mcglynn@geneseemedia.net> 2016-04-26 Brian McGlynn <brian.mcglynn@geneseemedia.net>
* Updated lib/rdcae.cpp to return error code when file does not exist * Updated lib/rdcae.cpp to return error code when file does not exist
in /var/snd in /var/snd
2015-04-26 Brian McGlynn <brian.mcglynn@geneseemedia.net>
* Added "Group By" statement in 'rdlibrary/rdlibrary.cpp' to allow a
full 100 results to be shown

2
rdlibrary/rdlibrary.cpp
View File

@ -1090,7 +1090,7 @@ void MainWidget::RefreshList()
RDCartSearchText(lib_filter_edit->text(),lib_group_box->currentText(), RDCartSearchText(lib_filter_edit->text(),lib_group_box->currentText(),
schedcode,true)+" && "+type_filter; schedcode,true)+" && "+type_filter;
} }
sql+=" order by CART.NUMBER"; sql+=" group by CART.NUMBER order by CART.NUMBER";
if(lib_showmatches_box->isChecked()) { if(lib_showmatches_box->isChecked()) {
sql+=QString().sprintf(" limit %d",RD_LIMITED_CART_SEARCH_QUANTITY); sql+=QString().sprintf(" limit %d",RD_LIMITED_CART_SEARCH_QUANTITY);
} }