Organize Movies MediaBrowser#12

Manual movie organization is working again!
softworkz · Oct 20, 2015 · 298ca71 · 298ca71
1 parent 0d74da0
commit 298ca71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/MediaBrowser.Api/Library/FileOrganizationService.cs b/MediaBrowser.Api/Library/FileOrganizationService.cs
@@ -188,7 +188,9 @@ public void Post(OrganizeEpisode request)
                 TargetFolder = request.TargetFolder
             });
 
-            Task.WaitAll(task);
+            var tasks = new Task[] { task };
+
+            Task.WaitAll(tasks, 8000);
         }
 
         public void Post(OrganizeMovie request)

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/components/fileorganizer/fileorganizer.js b/MediaBrowser.WebDashboard/dashboard-ui/components/fileorganizer/fileorganizer.js
@@ -46,7 +46,7 @@
 
         Dashboard.showLoadingMsg();
 
-        var resultId = $('#hfResultId', form).val();
+        var resultId = $('#hfResultIdMovie', form).val();
 
         var targetFolder = $('#selectMovieFolder', form).val();
 
@@ -270,6 +270,7 @@
         $('#txtNewSeriesYear', popup).val(item.ExtractedYear);
 
         $('#hfResultId', popup).val(item.Id);
+        $('#hfResultIdMovie', popup).val(item.Id);
         $('#hfNewSeriesProviderIds', popup).val(null);
         $('#hfNewSeriesName', popup).val(null);
         $('#hfNewSeriesYear', popup).val(null);

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/components/fileorganizer/fileorganizer.template.html b/MediaBrowser.WebDashboard/dashboard-ui/components/fileorganizer/fileorganizer.template.html
@@ -106,7 +106,7 @@
                 ${ButtonOk}
             </button>
         </p>
-        <input id="hfResultId" type="hidden" />
+        <input id="hfResultIdMovie" type="hidden" />
     </form>
 </div>