#879 Don't use the release grouping if the album list is filtered by …

…a role, eg. after drilling down from a "Conductor" menu.

Fix icon display in the Default web UI.
Show tracks in "Composer" section if they're part of a compilation.

Slim/Menu/BrowseLibrary.pm

@@ -1389,7 +1389,20 @@ sub _albumsOrReleases {
 	my ($client, $callback, $args, $pt) = @_;
 	my @searchTags = $pt->{'searchTags'} ? @{$pt->{'searchTags'}} : ();
 
-	if ($prefs->get('groupArtistAlbumsByReleaseType') && grep /^artist_id:/, @searchTags) {
+	# We only display the grouped albums if:
+	# 1. the feature is enabled
+	if ($prefs->get('groupArtistAlbumsByReleaseType')
+		# 2. a specific artist is requested
+		&& (grep /^artist_id:/, @searchTags)
+		# 3. any one of the following is true:
+		#    3a. we don't apply a role filter (eg. drilling down from a "Composers" menu)
+		&& ($prefs->get('noRoleFilter')
+			# 3b. no specific role is requested
+			|| !(grep /^role_id:/, @searchTags)
+			# 3c. we request the album artist
+			|| (grep /^role_id:.*ALBUMARTIST/, @searchTags)
+		)
+	) {
 		_releases(@_);
 	}
 	else {

Slim/Menu/BrowseLibrary/Releases.pm

@@ -27,6 +27,9 @@ sub _releases {
 		$_ && $_ !~ /(?:library_id\s*:\s*-1|remote_library)/
 	} @searchTags;
 
+	# we want all roles, as we're going to group
+	push @searchTags, 'role_id:1,2,3,4,5,6';
+
 	my @artistIds = grep /artist_id:/, @searchTags;
 	my $artistId;
 	if (scalar @artistIds) {
@@ -56,16 +59,16 @@ sub _releases {
 	my %contributions;
 	my %isPrimaryArtist;
 	foreach (@$albums) {
+		if ($_->{compilation}) {
+			$releaseTypes{COMPILATION}++;
+			# only list outside the compilations if Composer/Conductor
+			next if $_->{role_ids} !~ /[23]/;
+		}
 		# Release Types if main artist
-		if ($_->{role_ids} =~ /[1,5]/) {
+		elsif ($_->{role_ids} =~ /[1,5]/) {
 			$releaseTypes{$_->{release_type}}++;
 			next;
 		}
-		elsif ($_->{compilation}) {
-			$releaseTypes{COMPILATION}++;
-			# don't list as track artist on a compilation
-			next if $_->{role_ids} =~ /[156]/;
-		}
 
 		# Roles on other releases
 		my @roleIds = split(',', $_->{role_ids} || '');
@@ -120,7 +123,7 @@ sub _releases {
 	if (delete $contributions{COMPOSER}) {
 		push @items, {
 			name        => cstring($client, 'COMPOSITIONS'),
-			icon        => 'html/images/playlists.png',
+			image       => 'html/images/playlists.png',
 			type        => 'playlist',
 			playlist    => \&_tracks,
 			# for compositions we want to have the compositions only, not the albums
@@ -158,7 +161,7 @@ sub _releases {
 		# add "All" item
 		push @items, {
 			name        => cstring($client, 'ALL_ALBUMS'),
-			icon        => 'html/images/albums.png',
+			image       => 'html/images/albums.png',
 			type        => 'playlist',
 			playlist    => \&_tracks,
 			url         => \&_albums,
@@ -185,7 +188,7 @@ sub _createItem {
 
 	return {
 		name        => $name,
-		icon        => 'html/images/albums.png',
+		image       => 'html/images/albums.png',
 		type        => 'playlist',
 		playlist    => \&_tracks,
 		url         => \&_albums,