Merge pull request #92 from Drewster727/dev

approve tv shows or movies #76
Ombi-app · Mar 25, 2016 · 12bf66a · 12bf66a
2 parents faf21fc + 673f341
commit 12bf66a
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
@@ -32,7 +32,8 @@ public class PlexRequestSettings : Settings
 
         public bool SearchForMovies { get; set; }
         public bool SearchForTvShows { get; set; }
-        public bool RequireApproval { get; set; }
+        public bool RequireMovieApproval { get; set; }
+        public bool RequireTvShowApproval { get; set; }
         public int WeeklyRequestLimit { get; set; }
     }
 }
diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs
@@ -62,7 +62,8 @@ private void CreateDefaultSettingsPage()
         {
             var defaultSettings = new PlexRequestSettings
             {
-                RequireApproval = true,
+                RequireTvShowApproval = true,
+                RequireMovieApproval = true,
                 SearchForMovies = true,
                 SearchForTvShows = true,
                 WeeklyRequestLimit = 0

diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
@@ -218,7 +218,7 @@ private Response RequestMovie(int movieId)
 
             var settings = PrService.GetSettings();
             Log.Trace(settings.DumpJson());
-            if (!settings.RequireApproval)
+            if (!settings.RequireMovieApproval)
             {
                 var cpSettings = CpService.GetSettings();
 
@@ -324,7 +324,7 @@ private Response RequestTvShow(int showId, string seasons)
             model.SeasonList = seasonsList.ToArray();
 
             var settings = PrService.GetSettings();
-            if (!settings.RequireApproval)
+            if (!settings.RequireTvShowApproval)
             {
                 var sonarrSettings = SonarrService.GetSettings();
                 var sender = new TvSender(SonarrApi, SickrageApi);

diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs
@@ -37,6 +37,7 @@
 using PlexRequests.Helpers;
 using PlexRequests.Store;
 using PlexRequests.Store.Repository;
+using System.Diagnostics;
 
 namespace PlexRequests.UI
 {
@@ -68,7 +69,7 @@ static void Main(string[] args)
             if (port == -1)
                 port = GetStartupPort();
 
-            var options = new StartOptions($"http://+:{port}")
+            var options = new StartOptions(Debugger.IsAttached ? $"http://localhost:{port}" : $"http://+:{port}")
             {
                 ServerFactory = "Microsoft.Owin.Host.HttpListener"
             };

diff --git a/PlexRequests.UI/Views/Admin/Settings.cshtml b/PlexRequests.UI/Views/Admin/Settings.cshtml
@@ -55,13 +55,28 @@
             <div class="form-group">
                 <div class="checkbox">
                     <label>
-                        @if (Model.RequireApproval)
+                        @if (Model.RequireMovieApproval)
                         {
-                            <input type="checkbox" id="RequireApproval" name="RequireApproval" checked="checked"><text>Require approval of requests</text>
+                            <input type="checkbox" id="RequireMovieApproval" name="RequireMovieApproval" checked="checked"><text>Require approval of Movie requests</text>
                         }
                         else
                         {
-                            <input type="checkbox" id="RequireApproval" name="RequireApproval"><text>Require approval of requests</text>
+                            <input type="checkbox" id="RequireMovieApproval" name="RequireMovieApproval"><text>Require approval of Movie requests</text>
+                        }
+                    </label>
+
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="checkbox">
+                    <label>
+                        @if (Model.RequireTvShowApproval)
+                        {
+                            <input type="checkbox" id="RequireTvShowApproval" name="RequireTvShowApproval" checked="checked"><text>Require approval of TV show requests</text>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="RequireTvShowApproval" name="RequireTvShowApproval"><text>Require approval of TV show requests</text>
                         }
                     </label>