Merge pull request #253 from jcass77/fix/250_no_album_uri

Don't allow browsing tracks by album if album URI is not available.
This commit is contained in:
Nick Steel 2018-05-14 18:39:23 +01:00 committed by GitHub
commit eebbdb0fd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions

View File

@ -22,7 +22,6 @@ env:
- TOX_ENV=tidy - TOX_ENV=tidy
before_install: before_install:
- "sudo sed -i '/127.0.1.1/d' /etc/hosts" # Workaround https://github.com/tornadoweb/tornado/issues/1573
- "sudo apt-get update -qq" - "sudo apt-get update -qq"
install: install:

View File

@ -108,11 +108,13 @@ Changelog
(UNRELEASED) (UNRELEASED)
------------ ------------
- Detect additional stream formats (rtmp, rtmps, rtsp).
- Include details of currently selected page in HTML title tag. (Addresses: `#243 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/243>`_).
**Fixes** **Fixes**
- Detect additional stream formats (rtmp, rtmps, rtsp).
- Prevent excessive calls to the Mopidy server while buffering. (Fixes: `#237 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/237>`_). - Prevent excessive calls to the Mopidy server while buffering. (Fixes: `#237 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/237>`_).
- Include details of currently selected page in HTML title tag. (Addresses: `#243 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/243>`_). - Only allow browsing tracks by album if a URI is available for that album. (Fixes: `#250 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/250>`_).
v2.4.0 (2017-03-15) v2.4.0 (2017-03-15)
------------------- -------------------

View File

@ -306,8 +306,12 @@ function renderSongLiDivider (previousTrack, track, nextTrack, target) {
// Render differently if part of an album. // Render differently if part of an album.
if (!hasSameAlbum(previousTrack, track) && hasSameAlbum(track, nextTrack)) { if (!hasSameAlbum(previousTrack, track) && hasSameAlbum(track, nextTrack)) {
// Large divider with album cover. // Large divider with album cover.
showAlbum = ''
if (typeof track.album.uri !== 'undefined') {
showAlbum = 'onclick="return library.showAlbum(\'' + track.album.uri + '\', mopidy);"'
}
html += html +=
'<li class="albumdivider"><a href="#" onclick="return library.showAlbum(\'' + track.album.uri + '\', mopidy);">' + '<li class="albumdivider"><a href="#" ' + showAlbum + '>' +
'<img id="' + getjQueryID(target + '-cover', track.uri) + '" class="artistcover" width="30" height="30"/>' + '<img id="' + getjQueryID(target + '-cover', track.uri) + '" class="artistcover" width="30" height="30"/>' +
'<h1>' + track.album.name + '</h1><p>' + '<h1>' + track.album.name + '</h1><p>' +
renderSongLiTrackArtists(track) + '</p></a></li>' renderSongLiTrackArtists(track) + '</p></a></li>'

View File

@ -14,7 +14,7 @@ deps =
pytest-cov pytest-cov
pytest-xdist pytest-xdist
responses responses
install_command = pip install --allow-unverified=mopidy --pre {opts} {packages} install_command = pip install --pre {opts} {packages}
commands = commands =
py.test \ py.test \
--basetemp={envtmpdir} \ --basetemp={envtmpdir} \