[UI/Mobile] Minor style fixes
This commit is contained in:
@@ -80,7 +80,7 @@ Audio::Audio(Wt::WContainerWidget *parent)
|
|||||||
|
|
||||||
wApp->internalPathChanged().connect(std::bind([=] (std::string path)
|
wApp->internalPathChanged().connect(std::bind([=] (std::string path)
|
||||||
{
|
{
|
||||||
// order is important
|
// order is important: most specific path first
|
||||||
static std::map<std::string, int> indexes =
|
static std::map<std::string, int> indexes =
|
||||||
{
|
{
|
||||||
{ "/audio/search/preview", WidgetIdxSearchPreview},
|
{ "/audio/search/preview", WidgetIdxSearchPreview},
|
||||||
|
|||||||
@@ -104,18 +104,23 @@ ReleaseSearch::addResults(size_t nb)
|
|||||||
res->bindWidget("name", new Wt::WText(Wt::WString::fromUTF8(release->getName()), Wt::PlainText));
|
res->bindWidget("name", new Wt::WText(Wt::WString::fromUTF8(release->getName()), Wt::PlainText));
|
||||||
res->bindString("release_name", Wt::WString::fromUTF8(release->getName()), Wt::PlainText);
|
res->bindString("release_name", Wt::WString::fromUTF8(release->getName()), Wt::PlainText);
|
||||||
|
|
||||||
|
bool variousArtists;
|
||||||
auto artists = Artist::getByFilter(DboSession(),
|
auto artists = Artist::getByFilter(DboSession(),
|
||||||
SearchFilter::ById(SearchFilter::Field::Release, release.id()), -1, 2);
|
SearchFilter::ById(SearchFilter::Field::Release, release.id()), 0, 1, variousArtists);
|
||||||
if (artists.size() == 1)
|
if (!artists.empty())
|
||||||
{
|
{
|
||||||
Wt::WAnchor *artistAnchor = new Wt::WAnchor(ArtistView::getLink(artists.front().id()));
|
if (variousArtists)
|
||||||
Wt::WText *artist = new Wt::WText(artistAnchor);
|
{
|
||||||
artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText));
|
res->bindWidget("artist", new Wt::WText(Wt::WString::fromUTF8("Various Artists", Wt::PlainText)));
|
||||||
res->bindWidget("artist", artistAnchor);
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Wt::WAnchor *artistAnchor = new Wt::WAnchor(ArtistView::getLink(artists.front().id()));
|
||||||
|
Wt::WText *artist = new Wt::WText(artistAnchor);
|
||||||
|
artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText));
|
||||||
|
res->bindWidget("artist", artistAnchor);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
res->bindWidget("artist", new Wt::WText(Wt::WString::fromUTF8("Various Artists", Wt::PlainText)));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (moreResults)
|
if (moreResults)
|
||||||
|
|||||||
@@ -106,8 +106,10 @@ getArtistNameFromRelease(Release::pointer release)
|
|||||||
|
|
||||||
if (artists.size() > 1)
|
if (artists.size() > 1)
|
||||||
return Wt::WString::fromUTF8("Various artists", Wt::PlainText);
|
return Wt::WString::fromUTF8("Various artists", Wt::PlainText);
|
||||||
else
|
else if (artists.size() == 1)
|
||||||
return Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText);
|
return Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText);
|
||||||
|
else
|
||||||
|
return Wt::WString();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
Reference in New Issue
Block a user