milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

denormalize seasonid

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-05 01:40:18 -04:00
parent 1fd0fd981a
commit 5ba13ab5a0
14 changed files with 91 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

34
dashboard-ui/scripts/librarybrowser.js
View file

@ -1330,7 +1330,7 @@
});
}
else if (item.AlbumId && item.SeriesPrimaryImageTag) {
else if (item.SeriesId && item.SeriesPrimaryImageTag) {
imgUrl = ApiClient.getScaledImageUrl(item.SeriesId, {
type: "Primary",
@ -1993,18 +1993,9 @@
enableImageEnhancers: enableImageEnhancers
});
} else if (options.preferThumb && imageItem.SeriesThumbImageTag && options.inheritThumb !== false) {
imgUrl = ApiClient.getScaledImageUrl(imageItem.SeriesId, {
type: "Thumb",
maxWidth: thumbWidth,
tag: imageItem.SeriesThumbImageTag,
enableImageEnhancers: enableImageEnhancers
});
} else if (options.preferThumb && imageItem.ParentThumbItemId && options.inheritThumb !== false) {
imgUrl = ApiClient.getThumbImageUrl(imageItem.ParentThumbItemId, {
imgUrl = ApiClient.getScaledImageUrl(imageItem.ParentThumbItemId, {
type: "Thumb",
maxWidth: thumbWidth,
enableImageEnhancers: enableImageEnhancers
@ -2100,15 +2091,6 @@
enableImageEnhancers: enableImageEnhancers
});
} else if (imageItem.SeriesThumbImageTag) {
imgUrl = ApiClient.getScaledImageUrl(imageItem.SeriesId, {
type: "Thumb",
maxWidth: thumbWidth,
tag: imageItem.SeriesThumbImageTag,
enableImageEnhancers: enableImageEnhancers
});
} else if (imageItem.ParentThumbItemId) {
imgUrl = ApiClient.getThumbImageUrl(imageItem, {
@ -2539,6 +2521,8 @@
getPremiereDateText: function (item, date) {
var studio = (item.Studios || [])[0];
if (!date) {
var text = '';
@ -2547,12 +2531,12 @@
text += item.AirTime;
}
if (item.SeriesStudio) {
if (studio) {
if (text) {
text += " on " + item.SeriesStudio;
text += " on " + studio;
} else {
text += item.SeriesStudio;
text += studio;
}
}
@ -2565,8 +2549,8 @@
day += " at " + item.AirTime;
}
if (item.SeriesStudio) {
day += " on " + item.SeriesStudio;
if (studio) {
day += " on " + studio;
}
return day;