From cc87a41cad2c45883a2665fb70eefa93d557331f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 5 Mar 2014 21:13:08 -0500 Subject: [PATCH 01/16] fixes #723 - Tv series schedule sometimes empty --- dashboard-ui/scripts/livetvseriestimer.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dashboard-ui/scripts/livetvseriestimer.js b/dashboard-ui/scripts/livetvseriestimer.js index 10c74ca7b9..f720c8beb1 100644 --- a/dashboard-ui/scripts/livetvseriestimer.js +++ b/dashboard-ui/scripts/livetvseriestimer.js @@ -153,14 +153,15 @@ html += '
  • '; - var program = timer.ProgramInfo; + var program = timer.ProgramInfo || {}; var imgUrl; - if (program.ImageTags && program.ImageTags.Primary) { + var programImages = program.ImageTags || {}; + if (programImages.Primary) { imgUrl = ApiClient.getImageUrl(program.Id, { height: 160, - tag: program.ImageTags.Primary, + tag: programImages.Primary, type: "Primary" }); } else { @@ -234,9 +235,9 @@ userId: Dashboard.getCurrentUserId(), seriesTimerId: id - }).done(function (result) { + }).done(function (recordingResult) { - renderRecordings(page, result); + renderRecordings(page, recordingResult); }); @@ -244,9 +245,9 @@ seriesTimerId: id - }).done(function (result) { + }).done(function (timerResult) { - renderSchedule(page, result); + renderSchedule(page, timerResult); }); } From e7160955a12a0baf9218ef6563b956ab01cadade Mon Sep 17 00:00:00 2001 From: Tensre Date: Wed, 5 Mar 2014 20:44:29 -0800 Subject: [PATCH 02/16] Auto-Organize Copy/Move Option, Fix for Overwrite Existing File Addition of the option in Auto-Organize to copy or move files from watch folder. Fix to use the Overwrite Existing File option from the config rather than hardcoded value. --- dashboard-ui/autoorganizetv.html | 8 ++++++++ dashboard-ui/scripts/autoorganizetv.js | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html index 2f9c60446c..99494beed2 100644 --- a/dashboard-ui/autoorganizetv.html +++ b/dashboard-ui/autoorganizetv.html @@ -143,6 +143,14 @@
      +
    • + + +
      Copy or move files from the "Watch Folder"
      +
    • diff --git a/dashboard-ui/scripts/autoorganizetv.js b/dashboard-ui/scripts/autoorganizetv.js index 1217c00ded..a217d3e157 100644 --- a/dashboard-ui/scripts/autoorganizetv.js +++ b/dashboard-ui/scripts/autoorganizetv.js @@ -71,6 +71,9 @@ $('#txtMultiEpisodePattern', page).val(tvOptions.MultiEpisodeNamePattern).trigger('change'); $('#txtDeleteLeftOverFiles', page).val(tvOptions.LeftOverFileExtensionsToDelete.join(';')); + + $('#copyOrMoveFile', page).val(tvOptions.CopyOriginalFile.toString()).selectmenu('refresh'); + } $(document).on('pageinit', "#libraryFileOrganizerPage", function () { @@ -150,6 +153,8 @@ var watchLocation = $('#txtWatchFolder', form).val(); tvOptions.WatchLocations = watchLocation ? [watchLocation] : []; + tvOptions.CopyOriginalFile = $('#copyOrMoveFile', form).val(); + ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); }); From e8a58abae855802644ee84172dee14c3d5d139cf Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 6 Mar 2014 00:17:13 -0500 Subject: [PATCH 03/16] start on manual collection creation --- dashboard-ui/advancedserversettings.html | 10 ++--- dashboard-ui/boxsets.html | 39 ++++++++++++++---- dashboard-ui/metadata.html | 5 ++- dashboard-ui/scripts/moviecollections.js | 9 +++++ dashboard-ui/scripts/tvupcoming.js | 45 ++++----------------- dashboard-ui/scripts/wizardimagesettings.js | 3 +- dashboard-ui/scripts/wizardsettings.js | 2 + dashboard-ui/wizardimagesettings.html | 17 ++++---- dashboard-ui/wizardsettings.html | 7 +++- 9 files changed, 73 insertions(+), 64 deletions(-) diff --git a/dashboard-ui/advancedserversettings.html b/dashboard-ui/advancedserversettings.html index e4bbefdfa0..092ac77c42 100644 --- a/dashboard-ui/advancedserversettings.html +++ b/dashboard-ui/advancedserversettings.html @@ -25,16 +25,16 @@
      • -
    • - - -
      If you have a dynamic DNS enter it here. Media Browser apps will use it when connecting remotely.
      -
    • UPnP allows automated router configuration for remote access. This may not work with some router models.
      • +
    • + + +
      If you have a dynamic DNS enter it here. Media Browser apps will use it when connecting remotely.
      +