owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UI] Corrected regression on keyword search filter

Browse Source
This commit is contained in:
emeric
2015-07-29 22:36:23 +02:00
parent 16defc4f46
commit c1a4451fbd
5 changed files with 61 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/audio/desktop/KeywordSearchFilter.cpp
+6 -4
View File
@@ -49,10 +49,12 @@ KeywordSearchFilter::getConstraint(Database::SearchFilter& filter)
// For each part, do a global search on all searchable fields
for (const std::string& value : values)
{
filter.nameLikeMatch[Database::SearchFilter::Field::Artist].push_back(value);
filter.nameLikeMatch[Database::SearchFilter::Field::Release].push_back(value);
filter.nameLikeMatch[Database::SearchFilter::Field::Genre].push_back(value);
filter.nameLikeMatch[Database::SearchFilter::Field::Track].push_back(value);
filter.nameLikeMatch.push_back({
{Database::SearchFilter::Field::Artist, {value}},
{Database::SearchFilter::Field::Release, {value}},
{Database::SearchFilter::Field::Genre, {value}},
{Database::SearchFilter::Field::Track, {value}}
});
}
}
}
src/ui/audio/mobile/MobileAudio.cpp
+4 -4
View File
@@ -97,15 +97,15 @@ Audio::Audio(Wt::WContainerWidget *parent)
std::vector<std::string> keywords;
boost::algorithm::split(keywords, text, boost::is_any_of(" "), boost::token_compress_on);
releaseSearch->search(SearchFilter::NameLikeMatch( {
releaseSearch->search(SearchFilter::NameLikeMatch( {{
{ SearchFilter::Field::Artist, keywords },
{ SearchFilter::Field::Release, keywords }}),
{ SearchFilter::Field::Release, keywords }}}),
3);
artistSearch->search(SearchFilter::NameLikeMatch({{SearchFilter::Field::Artist, keywords}}),
artistSearch->search(SearchFilter::NameLikeMatch({{{SearchFilter::Field::Artist, keywords}}}),
3);
trackSearch->search(SearchFilter::NameLikeMatch({{SearchFilter::Field::Track, keywords}}),
trackSearch->search(SearchFilter::NameLikeMatch({{{SearchFilter::Field::Track, keywords}}}),
3);
artistSearch->show();