diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index a9b5ca268b..7faf2d49f8 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -265,7 +265,6 @@ $('#fldCommunityRating', page).hide(); $('#fldCommunityVoteCount', page).hide(); $('#genresCollapsible', page).hide(); - $('#countriesCollapsible', page).hide(); $('#peopleCollapsible', page).hide(); $('#studiosCollapsible', page).hide(); @@ -280,12 +279,17 @@ $('#fldCommunityVoteCount', page).show(); $('#genresCollapsible', page).show(); $('#peopleCollapsible', page).show(); - $('#countriesCollapsible', page).show(); $('#studiosCollapsible', page).show(); $('#fldOfficialRating', page).show(); $('#fldCustomRating', page).show(); } + if (item.Type == "Movie" || item.Type == "AdultVideo" || item.Type == "Trailer" || item.Type == "MusicArtist") { + $('#countriesCollapsible', page).show(); + } else { + $('#countriesCollapsible', page).hide(); + } + if (item.Type == "TvChannel") { $('#tagsCollapsible', page).hide(); $('#metadataSettingsCollapsible', page).hide(); diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index f8beafb278..5fa091587f 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -344,7 +344,7 @@ var options = { Limit: parseInt($('.playedIndicator', posterItem).html() || '10'), - Fields: "PrimaryImageAspectRatio", + Fields: "PrimaryImageAspectRatio,DateCreated", ParentId: itemId, IsFolder: false, GroupItems: false @@ -361,12 +361,11 @@ var item = response1[0]; var latestItems = response2[0]; - if (latestItems.length == 1) { - - var first = latestItems[0]; - Dashboard.navigate(LibraryBrowser.getHref(first)); - return; - } + //if (latestItems.length == 1) { + // var first = latestItems[0]; + // Dashboard.navigate(LibraryBrowser.getHref(first)); + // return; + //} var html = '
';
itemHtml += Globalize.translate('LabelAddedOnDate').replace('{0}', date.toLocaleDateString());
diff --git a/dashboard-ui/scripts/wizardimagesettings.js b/dashboard-ui/scripts/wizardimagesettings.js
index 474d28936d..6ab1b8d17f 100644
--- a/dashboard-ui/scripts/wizardimagesettings.js
+++ b/dashboard-ui/scripts/wizardimagesettings.js
@@ -4,29 +4,22 @@
Dashboard.showLoadingMsg();
- ApiClient.ajax({
- type: "POST",
- url: ApiClient.getUrl("System/Configuration/VideoImageExtraction", { Enabled: $('#chkVideoImages', page).checked() })
+ // After saving chapter task, now save server config
+ ApiClient.getServerConfiguration().done(function (config) {
- }).done(function () {
+ config.EnableUPnP = $('#chkEnableUpnp', page).checked();
+ ApiClient.updateServerConfiguration(config).done(function (result) {
- // After saving chapter task, now save server config
- ApiClient.getServerConfiguration().done(function (config) {
+ ApiClient.getNamedConfiguration("chapters").done(function (chapterConfig) {
- config.EnableUPnP = $('#chkEnableUpnp', page).checked();
+ chapterConfig.EnableMovieChapterImageExtraction = $('#chkMovies', page).checked();
- ApiClient.updateServerConfiguration(config).done(function (result) {
+ ApiClient.updateNamedConfiguration("chapters", chapterConfig).done(function () {
- ApiClient.getNamedConfiguration("chapters").done(function (chapterConfig) {
+ Dashboard.hideLoadingMsg();
- chapterConfig.EnableMovieChapterImageExtraction = $('#chkMovies', page).checked();
-
- ApiClient.updateNamedConfiguration("chapters", chapterConfig).done(function () {
-
- navigateToNextPage();
-
- });
+ navigateToNextPage();
});
});
});
diff --git a/dashboard-ui/wizardimagesettings.html b/dashboard-ui/wizardimagesettings.html
index 06d203fd92..05deb30969 100644
--- a/dashboard-ui/wizardimagesettings.html
+++ b/dashboard-ui/wizardimagesettings.html
@@ -13,11 +13,6 @@
${LabelConfigureSettings}
-