Merge pull request #845 from mhann/simple-button-dev

Fix Issue #742
Ombi-app · Jan 11, 2017 · 15ac3fa · 15ac3fa
2 parents 783d0c1 + b07b634
commit 15ac3fa
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 20 deletions.
diff --git 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
@@ -57,5 +57,6 @@ public SearchTvShowViewModel()
         public bool TvFullyAvailable { get; set; }
         public bool DisableTvRequestsByEpisode { get; set; }
         public bool DisableTvRequestsBySeason { get; set; }
+        public bool EnableTvRequestsForOnlySeries { get; set; }
     }
 }
diff --git a/Ombi.UI/Modules/SearchModule.cs b/Ombi.UI/Modules/SearchModule.cs
@@ -366,7 +366,8 @@ private async Task<Response> SearchTvShow(string searchTerm)
                     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
@@ -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>