From e56e244efbc0a6f6e56e0bceb3c0c321d2066572 Mon Sep 17 00:00:00 2001
From: Marcus Hann <marcushann@Marcuss-MacBook-Pro.local>
Date: Tue, 27 Dec 2016 23:05:44 +0000
Subject: [PATCH 1/5] Implement simple button

---
 Ombi.UI/Content/search.js               |  5 ++--
 Ombi.UI/Models/SearchTvShowViewModel.cs |  1 +
 Ombi.UI/Modules/SearchModule.cs         |  3 +-
 Ombi.UI/Views/Search/Index.cshtml       | 40 ++++++++++++++-----------
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/Ombi.UI/Content/search.js b/Ombi.UI/Content/search.js
index d05f3b4e6..443b1c050 100644
--- a/Ombi.UI/Content/search.js
+++ b/Ombi.UI/Content/search.js
@@ -83,7 +83,7 @@ $(function () {
     });
 
     // Click TV dropdown option
-    $(document).on("click", ".dropdownTv", function (e) {
+    $(document).on("click", ".requestTv", function (e) {
         e.preventDefault();
         var buttonId = e.target.id;
         if ($("#" + buttonId).attr('disabled')) {
@@ -429,7 +429,8 @@ $(function () {
             url: result.plexUrl,
             tvPartialAvailable: result.tvPartialAvailable,
             disableTvRequestsByEpisode: result.disableTvRequestsByEpisode,
-            disableTvRequestsBySeason: result.disableTvRequestsBySeason
+            disableTvRequestsBySeason: result.disableTvRequestsBySeason,
+            enableTvRequestsForOnlySeries: result.enableTvRequestsForOnlySeries
         };
 
         return context;
diff --git a/Ombi.UI/Models/SearchTvShowViewModel.cs b/Ombi.UI/Models/SearchTvShowViewModel.cs
index 47af1ba47..faa6333ba 100644
--- a/Ombi.UI/Models/SearchTvShowViewModel.cs
+++ b/Ombi.UI/Models/SearchTvShowViewModel.cs
@@ -57,5 +57,6 @@ namespace Ombi.UI.Models
         public bool TvFullyAvailable { get; set; }
         public bool DisableTvRequestsByEpisode { get; set; }
         public bool DisableTvRequestsBySeason { get; set; }
+        public bool EnableTvRequestsForOnlySeries { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Ombi.UI/Modules/SearchModule.cs b/Ombi.UI/Modules/SearchModule.cs
index 5722fc53f..f77e880e9 100644
--- a/Ombi.UI/Modules/SearchModule.cs
+++ b/Ombi.UI/Modules/SearchModule.cs
@@ -363,7 +363,8 @@ namespace Ombi.UI.Modules
                     SeriesName = t.show.name,
                     Status = t.show.status,
                     DisableTvRequestsByEpisode = prSettings.DisableTvRequestsByEpisode,
-                    DisableTvRequestsBySeason = prSettings.DisableTvRequestsBySeason
+                    DisableTvRequestsBySeason = prSettings.DisableTvRequestsBySeason,
+                    EnableTvRequestsForOnlySeries = (prSettings.DisableTvRequestsByEpisode && prSettings.DisableTvRequestsBySeason)
                 };
 
 
diff --git a/Ombi.UI/Views/Search/Index.cshtml b/Ombi.UI/Views/Search/Index.cshtml
index ffd6553d4..48da09b02 100644
--- a/Ombi.UI/Views/Search/Index.cshtml
+++ b/Ombi.UI/Views/Search/Index.cshtml
@@ -107,7 +107,7 @@
         }
 
 <!-- Movie and TV Results template -->
-<script id="search-template" type="text/x-handlebars-template">
+    <script id="search-template" type="text/x-handlebars-template">
     <div class="row">
         <div class="col-sm-2">
 
@@ -175,23 +175,27 @@
                         @*//TODO Not used yet*@
                         <button style="text-align: right" class="btn btn-success-outline disabled" disabled><i class="fa fa-check"></i> @UI.Search_Available</button><br />
                     {{else}}
-                        <div class="dropdown">
-                            <button id="{{id}}" class="btn {{#if available}}btn-success-outline{{else}}btn-primary-outline{{/if}} dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                                <i class="fa fa-plus"></i> {{#if available}}@UI.Search_Available{{else}}@UI.Search_Request {{/if}}
-                                <span class="caret"></span>
-                            </button>
-                            <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-                                <li><a id="{{id}}" season-select="0" class="dropdownTv " href="#">@UI.Search_AllSeasons</a></li>
-                                {{#if_eq disableTvRequestsBySeason false}}
-                                <li><a id="{{id}}" season-select="1" class="dropdownTv" href="#">@UI.Search_FirstSeason</a></li>
-                                <li><a id="{{id}}" season-select="2" class="dropdownTv" href="#">@UI.Search_LatestSeason</a></li>
-                                <li><a id="SeasonSelect" data-identifier="{{id}}" data-toggle="modal" data-target="#seasonsModal" href="#">@UI.Search_SelectSeason...</a></li>
-                                {{/if_eq}}
-                                {{#if_eq disableTvRequestsByEpisode false}}
-                                <li><a id="EpisodeSelect" data-identifier="{{id}}" data-toggle="modal" data-target="#episodesModal" href="#">@UI.Search_SelectEpisode...</a></li>
-                                {{/if_eq}}
-                            </ul>
-                        </div>
+                        {{#if_eq enableTvRequestsForOnlySeries true}}
+                            <button id="{{id}}" style="text-align: right" class="btn {{#if available}}btn-success-outline{{else}}btn-primary-outline{{/if}} btn-primary-outline requestTv" season-select="0" type="button"><i class="fa fa-plus"></i> @UI.Search_Request</button>
+                        {{else}}
+                            <div class="dropdown">
+                                <button id="{{id}}" class="btn {{#if available}}btn-success-outline{{else}}btn-primary-outline{{/if}} dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                                    <i class="fa fa-plus"></i> {{#if available}}@UI.Search_Available{{else}}@UI.Search_Request {{/if}}
+                                    <span class="caret"></span>
+                                </button>
+                                <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                                    <li><a id="{{id}}" season-select="0" class="dropdownTv " href="#">@UI.Search_AllSeasons</a></li>
+                                    {{#if_eq disableTvRequestsBySeason false}}
+                                    <li><a id="{{id}}" season-select="1" class="dropdownTv" href="#">@UI.Search_FirstSeason</a></li>
+                                    <li><a id="{{id}}" season-select="2" class="dropdownTv" href="#">@UI.Search_LatestSeason</a></li>
+                                    <li><a id="SeasonSelect" data-identifier="{{id}}" data-toggle="modal" data-target="#seasonsModal" href="#">@UI.Search_SelectSeason...</a></li>
+                                    {{/if_eq}}
+                                    {{#if_eq disableTvRequestsByEpisode false}}
+                                    <li><a id="EpisodeSelect" data-identifier="{{id}}" data-toggle="modal" data-target="#episodesModal" href="#">@UI.Search_SelectEpisode...</a></li>
+                                    {{/if_eq}}
+                                </ul>
+                            </div>
+                        {{/if_eq}}
                 {{#if available}}
                 <br />
                 <a style="text-align: right" class="btn btn-sm btn-primary-outline" href="{{url}}" target="_blank"><i class="fa fa-eye"></i> @UI.Search_ViewInPlex</a>

From b07b634d2149f537101f07ebadd1954f2ae7c12b Mon Sep 17 00:00:00 2001
From: Marcus Hann <marcushann@Marcuss-MacBook-Pro.local>
Date: Tue, 27 Dec 2016 23:06:39 +0000
Subject: [PATCH 2/5] Fix indentation issue

---
 Ombi.UI/Views/Search/Index.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ombi.UI/Views/Search/Index.cshtml b/Ombi.UI/Views/Search/Index.cshtml
index 48da09b02..8dc8fb4c2 100644
--- a/Ombi.UI/Views/Search/Index.cshtml
+++ b/Ombi.UI/Views/Search/Index.cshtml
@@ -107,7 +107,7 @@
         }
 
 <!-- Movie and TV Results template -->
-    <script id="search-template" type="text/x-handlebars-template">
+<script id="search-template" type="text/x-handlebars-template">
     <div class="row">
         <div class="col-sm-2">
 

From 454382cdd79e38aea7e2d6864ea4d148987f8437 Mon Sep 17 00:00:00 2001
From: thegame3202 <mike.hamilton721@gmail.com>
Date: Tue, 10 Jan 2017 10:33:06 -0600
Subject: [PATCH 3/5] Plex Username Case Sensitivity Fix

COLLATE NOCASE for Plex users
---
 Ombi.Store/Repository/PlexUserRepository.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Ombi.Store/Repository/PlexUserRepository.cs b/Ombi.Store/Repository/PlexUserRepository.cs
index 6ef713014..69bb31816 100644
--- a/Ombi.Store/Repository/PlexUserRepository.cs
+++ b/Ombi.Store/Repository/PlexUserRepository.cs
@@ -48,21 +48,24 @@ namespace Ombi.Store.Repository
         public PlexUsers GetUser(string userGuid)
         {
             var sql = @"SELECT * FROM PlexUsers
-            WHERE PlexUserId = @UserGuid";
+            WHERE PlexUserId = @UserGuid
+             COLLATE NOCASE";
             return Db.QueryFirstOrDefault<PlexUsers>(sql, new {UserGuid = userGuid});
         }
 
         public PlexUsers GetUserByUsername(string username)
         {
             var sql = @"SELECT * FROM PlexUsers
-            WHERE Username = @UserName";
+            WHERE Username = @UserName
+             COLLATE NOCASE";
             return Db.QueryFirstOrDefault<PlexUsers>(sql, new {UserName = username});
         }
 
         public async Task<PlexUsers> GetUserAsync(string userguid)
         {
             var sql = @"SELECT * FROM PlexUsers
-            WHERE PlexUserId = @UserGuid";
+            WHERE PlexUserId = @UserGuid
+             COLLATE NOCASE";
             return await Db.QueryFirstOrDefaultAsync<PlexUsers>(sql, new {UserGuid = userguid});
         }
 

From 0602a712741d176082ecb1ac327a4f485f258858 Mon Sep 17 00:00:00 2001
From: "Jamie.Rees" <Jamie.Rees>
Date: Wed, 11 Jan 2017 08:18:24 +0000
Subject: [PATCH 4/5] Changed the settings name from Plex Requests to Ombi

---
 Ombi.UI/Views/Admin/Settings.cshtml          | 2 +-
 Ombi.UI/Views/Shared/Partial/_Sidebar.cshtml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Ombi.UI/Views/Admin/Settings.cshtml b/Ombi.UI/Views/Admin/Settings.cshtml
index 559373e9a..54e588c20 100644
--- a/Ombi.UI/Views/Admin/Settings.cshtml
+++ b/Ombi.UI/Views/Admin/Settings.cshtml
@@ -23,7 +23,7 @@
 <div class="col-sm-8 col-sm-push-1">
     <form class="form-horizontal" method="POST" id="mainForm">
         <fieldset>
-            <legend>Plex Request Settings</legend>
+            <legend>Ombi Configuration</legend>
             <div class="form-group">
                 <label for="portNumber" class="control-label">Port</label>
 
diff --git a/Ombi.UI/Views/Shared/Partial/_Sidebar.cshtml b/Ombi.UI/Views/Shared/Partial/_Sidebar.cshtml
index 34b080460..df5969a95 100644
--- a/Ombi.UI/Views/Shared/Partial/_Sidebar.cshtml
+++ b/Ombi.UI/Views/Shared/Partial/_Sidebar.cshtml
@@ -3,7 +3,7 @@
 <div class="col-lg-3 col-md-3 col-sm-4">
     <div class="list-group table-of-contents">
         @Html.GetSidebarUrl(Context, "/admin/about", "About")
-        @Html.GetSidebarUrl(Context, "/admin", "Plex Request")
+        @Html.GetSidebarUrl(Context, "/admin", "Ombi Configuration")
         @Html.GetSidebarUrl(Context, "/admin/customization", "Customization")
         @Html.GetSidebarUrl(Context, "/admin/landingpage", "Landing Page")
         @Html.GetSidebarUrl(Context, "/admin/authentication", "Authentication")

From bda34c9d1b2c006d026afcd637320ace4bb1b461 Mon Sep 17 00:00:00 2001
From: "Jamie.Rees" <Jamie.Rees>
Date: Wed, 11 Jan 2017 08:40:31 +0000
Subject: [PATCH 5/5] Fixed #891

---
 Ombi.Services/Notification/NotificationEngine.cs | 12 ++++++------
 Ombi.UI/Modules/RequestsModule.cs                |  3 ++-
 Ombi.UI/Modules/SearchModule.cs                  |  6 ++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Ombi.Services/Notification/NotificationEngine.cs b/Ombi.Services/Notification/NotificationEngine.cs
index 44caf75b1..3782a1bfb 100644
--- a/Ombi.Services/Notification/NotificationEngine.cs
+++ b/Ombi.Services/Notification/NotificationEngine.cs
@@ -95,7 +95,7 @@ namespace Ombi.Services.Notification
                         if (user.Equals(adminUsername, StringComparison.CurrentCultureIgnoreCase))
                         {
                             Log.Info("This user is the Plex server owner");
-                            await PublishUserNotification(userAccount.Username, userAccount.Email, model.Title, model.PosterPath, type);
+                            await PublishUserNotification(userAccount.Username, userAccount.Email, model.Title, model.PosterPath, type, model.Type);
                             return;
                         }
 
@@ -108,7 +108,7 @@ namespace Ombi.Services.Notification
                         }
 
                         Log.Info("Sending notification to: {0} at: {1}, for title: {2}", email.Username, email.Email, model.Title);
-                        await PublishUserNotification(email.Username, email.Email, model.Title, model.PosterPath, type);
+                        await PublishUserNotification(email.Username, email.Email, model.Title, model.PosterPath, type, model.Type);
                     }
                 }
             }
@@ -137,7 +137,7 @@ namespace Ombi.Services.Notification
                     if (user.Equals(adminUsername, StringComparison.CurrentCultureIgnoreCase))
                     {
                         Log.Info("This user is the Plex server owner");
-                        await PublishUserNotification(userAccount.Username, userAccount.Email, model.Title, model.PosterPath, type);
+                        await PublishUserNotification(userAccount.Username, userAccount.Email, model.Title, model.PosterPath, type, model.Type);
                         return;
                     }
 
@@ -150,7 +150,7 @@ namespace Ombi.Services.Notification
                     }
 
                     Log.Info("Sending notification to: {0} at: {1}, for title: {2}", email.Username, email.Email, model.Title);
-                    await PublishUserNotification(email.Username, email.Email, model.Title, model.PosterPath, type);
+                    await PublishUserNotification(email.Username, email.Email, model.Title, model.PosterPath, type, model.Type);
                 }
             }
             catch (Exception e)
@@ -159,7 +159,7 @@ namespace Ombi.Services.Notification
             }
         }
 
-        private async Task PublishUserNotification(string username, string email, string title, string img, NotificationType type)
+        private async Task PublishUserNotification(string username, string email, string title, string img, NotificationType type, RequestType requestType)
         {
             var notificationModel = new NotificationModel
             {
@@ -167,7 +167,7 @@ namespace Ombi.Services.Notification
                 UserEmail = email,
                 NotificationType = type,
                 Title = title,
-                ImgSrc = img
+                ImgSrc = requestType == RequestType.Movie ? $"https://image.tmdb.org/t/p/w300/{img}" : img
             };
 
             // Send the notification to the user.
diff --git a/Ombi.UI/Modules/RequestsModule.cs b/Ombi.UI/Modules/RequestsModule.cs
index d707244c0..0bd6a3d04 100644
--- a/Ombi.UI/Modules/RequestsModule.cs
+++ b/Ombi.UI/Modules/RequestsModule.cs
@@ -351,7 +351,8 @@ namespace Ombi.UI.Modules
                 NotificationType = NotificationType.Issue,
                 Title = originalRequest.Title,
                 DateTime = DateTime.Now,
-                Body = issue == IssueState.Other ? comment : issue.ToString().ToCamelCaseWords()
+                Body = issue == IssueState.Other ? comment : issue.ToString().ToCamelCaseWords(),
+                ImgSrc = originalRequest.Type == RequestType.Movie ? $"https://image.tmdb.org/t/p/w300/{originalRequest.PosterPath}" : originalRequest.PosterPath
             };
             await NotificationService.Publish(model);
 
diff --git a/Ombi.UI/Modules/SearchModule.cs b/Ombi.UI/Modules/SearchModule.cs
index d1a0722b0..8759d0325 100644
--- a/Ombi.UI/Modules/SearchModule.cs
+++ b/Ombi.UI/Modules/SearchModule.cs
@@ -1277,7 +1277,8 @@ namespace Ombi.UI.Modules
                     User = Username,
                     DateTime = DateTime.Now,
                     NotificationType = NotificationType.NewRequest,
-                    RequestType = model.Type
+                    RequestType = model.Type,
+                    ImgSrc = model.Type == RequestType.Movie ? $"https://image.tmdb.org/t/p/w300/{model.PosterPath}" : model.PosterPath
                 };
                 await NotificationService.Publish(notificationModel);
             }
@@ -1315,7 +1316,8 @@ namespace Ombi.UI.Modules
                     User = Username,
                     DateTime = DateTime.Now,
                     NotificationType = NotificationType.NewRequest,
-                    RequestType = model.Type
+                    RequestType = model.Type,
+                    ImgSrc = model.Type == RequestType.Movie ? $"https://image.tmdb.org/t/p/w300/{model.PosterPath}" : model.PosterPath
                 };
                 await NotificationService.Publish(notificationModel);
             }