From f5a057294669e03cecb5f5f49934cfd856db53d8 Mon Sep 17 00:00:00 2001
From: "Jamie.Rees" <Jamie.Rees>
Date: Thu, 5 Oct 2017 14:08:52 +0100
Subject: [PATCH] Fixed some cosmetic issues #865

---
 .../Rule/Rules/Request/CanRequestRule.cs      |  2 +-
 .../Rules/Request/ExistingMovieRequestRule.cs |  3 +-
 .../app/search/moviesearch.component.html     | 51 +------------------
 .../app/search/tvsearch.component.html        | 30 +++--------
 4 files changed, 9 insertions(+), 77 deletions(-)

diff --git a/src/Ombi.Core/Rule/Rules/Request/CanRequestRule.cs b/src/Ombi.Core/Rule/Rules/Request/CanRequestRule.cs
index 79e202162..fcbf75806 100644
--- a/src/Ombi.Core/Rule/Rules/Request/CanRequestRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Request/CanRequestRule.cs
@@ -30,7 +30,7 @@ namespace Ombi.Core.Rule.Rules
 
             if (User.IsInRole(OmbiRoles.RequestTv))
                 return Task.FromResult(Success());
-            return Task.FromResult(Fail("You do not have permissions to Request a Movie"));
+            return Task.FromResult(Fail("You do not have permissions to Request a TV Show"));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Ombi.Core/Rule/Rules/Request/ExistingMovieRequestRule.cs b/src/Ombi.Core/Rule/Rules/Request/ExistingMovieRequestRule.cs
index 8312b4e9a..c982ecf17 100644
--- a/src/Ombi.Core/Rule/Rules/Request/ExistingMovieRequestRule.cs
+++ b/src/Ombi.Core/Rule/Rules/Request/ExistingMovieRequestRule.cs
@@ -30,8 +30,7 @@ namespace Ombi.Core.Rule.Rules.Request
                 var existing = await movieRequests.FirstOrDefaultAsync(x => x.TheMovieDbId == movie.TheMovieDbId);
                 if (existing != null) // Do we already have a request for this?
                 {
-
-                    return Fail($"{obj.Title} has already been requested");
+                    return Fail($"\"{obj.Title}\" has already been requested");
                 }
             }
             return Success();
diff --git a/src/Ombi/ClientApp/app/search/moviesearch.component.html b/src/Ombi/ClientApp/app/search/moviesearch.component.html
index ac46926aa..391946c2e 100644
--- a/src/Ombi/ClientApp/app/search/moviesearch.component.html
+++ b/src/Ombi/ClientApp/app/search/moviesearch.component.html
@@ -88,60 +88,11 @@
                         <button id="{{result.id}}" style="text-align: right" class="btn btn-primary-outline" (click)="request(result)"><i class="fa fa-plus"></i> Request</button>
                     </ng-template>
                         </div>
-                    <!--{{#if_eq type "tv"}}
-                    {{#if_eq tvFullyAvailable true}}
-                    @*//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}}
-                    {{#if_eq enableTvRequestsForOnlySeries true}}
-                    <button id="{{id}}" style="text-align: right" class="btn {{#if available}}btn-success-outline{{else}}btn-primary-outline dropdownTv{{/if}} btn-primary-outline" season-select="0" type="button" {{#if available}} disabled{{/if}}><i class="fa fa-plus"></i> {{#if available}}@UI.Search_Available{{else}}@UI.Search_Request{{/if}}</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}}
-                    {{#if url}}
-                    <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>
-                    {{/if}}
-                    {{/if}}
-                    {{/if_eq}}
-                    {{/if_eq}}-->
-
 
                     <br/>
                     <div *ngIf="result.available">
                         <a *ngIf="result.plexUrl" style="text-align: right" class="btn btn-sm btn-success-outline" href="{{result.plexUrl}}" target="_blank"><i class="fa fa-eye"></i> View On Plex</a>
-                        <!--<input name="providerId" type="text" value="{{id}}" hidden="hidden"/>
-                        <input name="type" type="text" value="{{type}}" hidden="hidden"/>
-                        <div class="dropdown">
-                            <button class="btn btn-sm btn-danger-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                                <i class="fa fa-exclamation"></i> Report Issue
-                                <span class="caret"></span>
-                            </button>
-                            <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-                                <li><a issue-select="0" class="dropdownIssue" href="#">WrongAudio</a></li>
-                                <li><a issue-select="1" class="dropdownIssue" href="#">NoSubs</a></li>
-                                <li><a issue-select="2" class="dropdownIssue" href="#">WrongContent</a></li>
-                                <li><a issue-select="3" class="dropdownIssue" href="#">Playback</a></li>
-                                <li><a issue-select="4" class="dropdownIssue" href="#" data-toggle="modal" data-target="#issuesModal">Other</a></li>
-                            </ul>
-                        </div>-->
+
                     </div>
 
                 </div>
diff --git a/src/Ombi/ClientApp/app/search/tvsearch.component.html b/src/Ombi/ClientApp/app/search/tvsearch.component.html
index 647310abf..c144e2433 100644
--- a/src/Ombi/ClientApp/app/search/tvsearch.component.html
+++ b/src/Ombi/ClientApp/app/search/tvsearch.component.html
@@ -95,43 +95,25 @@
                                 <div *ngIf="node.data.fullyAvailable">
                                     <button style="text-align: right" class="btn btn-success-outline disabled" disabled><i class="fa fa-check"></i> Available</button>
                                 </div>
-                                <!--
-            <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>
-
-            -->
-
-
                                 <br />
                                 <div *ngIf="node.data.available">
                                     <a *ngIf="node.data.plexUrl" style="text-align: right" class="btn btn-sm btn-success-outline" href="{{node.data.plexUrl}}" target="_blank"><i class="fa fa-eye"></i> View On Plex</a>
-
-                                    <!--<input name="providerId" type="text" value="{{id}}" hidden="hidden"/>
-                <input name="type" type="text" value="{{type}}" hidden="hidden"/>
-                <div class="dropdown">
-                    <button class="btn btn-sm btn-danger-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                        <i class="fa fa-exclamation"></i> Report Issue
-                        <span class="caret"></span>
-                    </button>
-                    <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-                        <li><a issue-select="0" class="dropdownIssue" href="#">WrongAudio</a></li>
-                        <li><a issue-select="1" class="dropdownIssue" href="#">NoSubs</a></li>
-                        <li><a issue-select="2" class="dropdownIssue" href="#">WrongContent</a></li>
-                        <li><a issue-select="3" class="dropdownIssue" href="#">Playback</a></li>
-                        <li><a issue-select="4" class="dropdownIssue" href="#" data-toggle="modal" data-target="#issuesModal">Other</a></li>
-                    </ul>
-                </div>-->
+                                </div>
+                                <div *ngIf="!node.data.available">
+                                    <br/>
+                                    <br/>
                                 </div>
 
                             </div>
 
                         </div>
-                        <hr />
                     </div>
                     <!--This is the section that holds the child seasons if they want to specify specific episodes-->
                     <div *ngIf="node.leaf">
                         <seriesinformation [seriesId]="node.data.id"></seriesinformation>
                     </div>
+                    
+                    <hr />
                 </ng-template>
             </p-column>
         </p-treeTable>