diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index 4f6546b4e5..e619286183 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -73,8 +73,8 @@
${LabelAlbum}
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index fb6ebde48e..b4e202e2be 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -501,12 +501,20 @@
$('#txtAirsBeforeEpisode', page).val(('AirsBeforeEpisodeNumber' in item) ? item.AirsBeforeEpisodeNumber : "");
$('#txtAlbum', page).val(item.Album || "");
- $('#txtAlbumArtist', page).val(item.AlbumArtist || "");
+
+ $('#txtAlbumArtist', page).val((item.AlbumArtists || []).map(function (a) {
+
+ return a.Name;
+
+ }).join(';'));
$('#selectDisplayOrder', page).val(item.DisplayOrder).selectmenu('refresh');
- var artists = item.Artists || [];
- $('#txtArtist', page).val(artists.join(';'));
+ $('#txtArtist', page).val((item.ArtistItems || []).map(function (a) {
+
+ return a.Name;
+
+ }).join(';'));
var date;
@@ -802,6 +810,26 @@
.jstree("delete_node", '#' + id);
}
+ function getAlbumArtists(form) {
+
+ return $('#txtAlbumArtist', form).val().split(';').map(function (a) {
+
+ return {
+ Name: a
+ };
+ });
+ }
+
+ function getArtists(form) {
+
+ return $('#txtArtist', form).val().split(';').map(function (a) {
+
+ return {
+ Name: a
+ };
+ });
+ }
+
function editItemMetadataPage() {
var self = this;
@@ -834,8 +862,8 @@
DisplayOrder: $('#selectDisplayOrder', form).val(),
Players: $('#txtPlayers', form).val(),
Album: $('#txtAlbum', form).val(),
- AlbumArtist: $('#txtAlbumArtist', form).val(),
- Artists: $('#txtArtist', form).val().split(';'),
+ AlbumArtist: getAlbumArtists(form),
+ ArtistItems: getArtists(form),
Metascore: $('#txtMetascore', form).val(),
AwardSummary: $('#txtAwardSummary', form).val(),
Overview: $('#txtOverview', form).val(),
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index e23ffec121..2d0e21d821 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -462,7 +462,7 @@
switch (index) {
case 0:
- return 'smalllibrarytiles-automobile';
+ return 'librarytiles-automobile';
case 1:
return 'resume';
case 2:
@@ -493,6 +493,9 @@
else if (section == 'smalllibrarytiles-automobile') {
Sections.loadLibraryTiles(elem, userId, 'homePageSmallBackdrop', index, true);
}
+ else if (section == 'librarytiles-automobile') {
+ Sections.loadLibraryTiles(elem, userId, 'backdrop', index, true);
+ }
else if (section == 'librarybuttons') {
Sections.loadlibraryButtons(elem, userId, index);
}
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index b40bb96eb7..d9a4530176 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -229,7 +229,7 @@
MediaTypes: "",
IncludeItemTypes: "MusicVideo",
PersonTypes: "",
- Artists: ""
+ ArtistIds: ""
});
});
@@ -241,7 +241,7 @@
MediaTypes: "",
IncludeItemTypes: "Movie",
PersonTypes: "",
- Artists: ""
+ ArtistIds: ""
});
});
@@ -253,7 +253,7 @@
MediaTypes: "",
IncludeItemTypes: "Series",
PersonTypes: "",
- Artists: ""
+ ArtistIds: ""
});
});
@@ -264,7 +264,7 @@
MediaTypes: "",
IncludeItemTypes: "Trailer",
PersonTypes: "",
- Artists: ""
+ ArtistIds: ""
});
});
@@ -275,7 +275,7 @@
IncludeItemTypes: "",
MediaTypes: "Game",
PersonTypes: "",
- Artists: ""
+ ArtistIds: ""
});
});
@@ -286,7 +286,7 @@
MediaTypes: "",
IncludeItemTypes: "Episode",
PersonTypes: "",
- Artists: ""
+ ArtistIds: ""
});
});
@@ -297,7 +297,7 @@
MediaTypes: "",
IncludeItemTypes: "MusicAlbum",
PersonTypes: "",
- Artists: ""
+ ArtistIds: ""
});
});
@@ -307,7 +307,7 @@
MediaTypes: "",
IncludeItemTypes: "Audio",
PersonTypes: "",
- Artists: ""
+ ArtistIds: ""
});
});
}
@@ -378,10 +378,10 @@
query.Genres = currentItem.Name;
}
else if (currentItem.Type == "Studio") {
- query.Studios = currentItem.Name;
+ query.StudioIds = currentItem.Id;
}
else if (currentItem.Type == "MusicArtist") {
- query.Artists = currentItem.Name;
+ query.ArtistIds = currentItem.Id;
}
}
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 041dfa6ef2..4d38cce679 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -406,8 +406,8 @@
$('#players', page).hide();
}
- if (item.Artists && item.Artists.length && item.Type != "MusicAlbum") {
- $('#artist', page).show().html(getArtistLinksHtml(item.Artists, context)).trigger('create');
+ if (item.ArtistItems && item.ArtistItems.length && item.Type != "MusicAlbum") {
+ $('#artist', page).show().html(getArtistLinksHtml(item.ArtistItems, context)).trigger('create');
} else {
$('#artist', page).hide();
}
@@ -512,7 +512,7 @@
var artist = artists[i];
- html.push('
' + artist + ' ');
+ html.push('
' + artist.Name + ' ');
}
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 08823d41f5..b4456a9009 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -214,7 +214,7 @@
return counts.join(' • ');
},
- getArtistLinksHtml: function (artists) {
+ getArtistLinksHtml: function (artists, cssClass) {
var html = [];
@@ -222,7 +222,8 @@
var artist = artists[i];
- html.push('
' + artist + ' ');
+ var css = cssClass ? (' class="' + cssClass + '"') : '';
+ html.push('
' + artist.Name + ' ');
}
@@ -797,7 +798,10 @@
textlines.push(displayName);
if (item.Type == 'Audio') {
- textlines.push(item.Artists.join(', ') || ' ');
+ textlines.push(item.ArtistItems.map(function (a) {
+ return a.Name;
+
+ }).join(', ') || ' ');
}
if (item.Type == 'Game') {
@@ -1744,12 +1748,10 @@
var contextParam = context ? ('&context=' + context) : '';
- if (item.AlbumArtist && item.Type == "Audio") {
- html.push('
' + item.AlbumArtist + ' ');
- } else if (item.AlbumArtist && item.Type == "MusicAlbum") {
- html.push('
' + item.AlbumArtist + ' ');
- } else if (item.Artists && item.Artists.length && item.Type == "MusicVideo") {
- html.push('
' + item.Artists[0] + ' ');
+ if (item.AlbumArtists) {
+ html.push(LibraryBrowser.getArtistLinksHtml(item.AlbumArtists, "detailPageParentLink"));
+ } else if (item.ArtistItems && item.ArtistItems.length && item.Type == "MusicVideo") {
+ html.push(LibraryBrowser.getArtistLinksHtml(item.ArtistItems, "detailPageParentLink"));
} else if (item.SeriesName && item.Type == "Episode") {
html.push('
' + item.SeriesName + ' ');
@@ -1769,11 +1771,8 @@
} else if (item.Album && item.Type == "MusicVideo" && item.AlbumId) {
html.push('
' + item.Album + ' ');
- } else if (item.AlbumArtist && item.Type == "MusicAlbum") {
-
} else if (item.Album) {
html.push(item.Album);
-
}
if (html.length) {
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 15677d1f1f..e69455df22 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -423,7 +423,7 @@
else if (firstItem.Type == "MusicArtist") {
promise = self.getItemsForPlayback({
- Artists: firstItem.Name,
+ ArtistIds: firstItem.Id,
Filters: "IsNotFolder",
Recursive: true,
SortBy: "SortName",
@@ -949,7 +949,7 @@
if (item.Type == "MusicArtist") {
query.MediaTypes = "Audio";
- query.Artists = item.Name;
+ query.ArtistIds = item.Id;
}
else if (item.Type == "MusicGenre") {
diff --git a/dashboard-ui/scripts/playlist.js b/dashboard-ui/scripts/playlist.js
index 81750ec790..c05663158c 100644
--- a/dashboard-ui/scripts/playlist.js
+++ b/dashboard-ui/scripts/playlist.js
@@ -37,12 +37,12 @@
html += '';
html += '
';
- html += LibraryBrowser.getArtistLinksHtml(item.Artists || []);
+ html += LibraryBrowser.getArtistLinksHtml(item.ArtistItems || []);
html += ' ';
html += '
';
if (item.AlbumArtist) {
- html += LibraryBrowser.getArtistLinksHtml([item.AlbumArtist]);
+ html += LibraryBrowser.getArtistLinksHtml(item.AlbumArtists || []);
}
html += ' ';