github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-16 02:02:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

#254

Browse source
This commit is contained in:
tidusjar 2016-07-28 13:59:00 +01:00
parent 5024178724
commit b4bc51c862
6 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
PlexRequests.UI/Content/search.js vendored
View file

@ -603,7 +603,7 @@ $(function () {
var url = createBaseUrl(mainBaseUrl, "search/request/tvEpisodes"); var url = createBaseUrl(mainBaseUrl, "search/request/tvEpisodes");
var type = $form.prop('method'); var type = $form.prop('method');
$('#episodesModal').modal('toggle');
sendRequestAjax(JSON.stringify(finalObj), type, url, tvId); sendRequestAjax(JSON.stringify(finalObj), type, url, tvId);
}); });
@ -627,7 +627,8 @@ $(function () {
name: result.name, name: result.name,
season: result.seasonNumber, season: result.seasonNumber,
number: result.episodeNumber, number: result.episodeNumber,
requested: result.requested requested: result.requested,
episodeId: result.episodeId
} }
} }
}); });

1
PlexRequests.UI/Models/EpisodeListViewModel.cs
View file

@ -33,5 +33,6 @@ namespace PlexRequests.UI.Models
public bool Requested { get; set; } public bool Requested { get; set; }
public string Name { get; set; } public string Name { get; set; }
public int Id { get; set; } public int Id { get; set; }
public int EpisodeId { get; set; } // Not used other than in the view to keep everything unique
} }
} }

9
PlexRequests.UI/Modules/SearchModule.cs
View file

@ -557,7 +557,7 @@ namespace PlexRequests.UI.Modules
var s = await sonarrSettings; var s = await sonarrSettings;
if (!s.Enabled) if (!s.Enabled)
{ {
return Response.AsJson(new JsonResponseModel { Message = "This is currently only supported with Sonarr", Result = false }); return Response.AsJson(new JsonResponseModel { Message = "This is currently only supported with Sonarr, Please enable Sonarr for this feature", Result = false });
} }
} }
@ -941,8 +941,8 @@ namespace PlexRequests.UI.Modules
var enumerable = allResults as RequestedModel[] ?? allResults.ToArray(); var enumerable = allResults as RequestedModel[] ?? allResults.ToArray();
var dbDbShow = enumerable.FirstOrDefault(x => x.Type == RequestType.TvShow && x.TvDbId == seriesId.ToString()); var dbDbShow = enumerable.FirstOrDefault(x => x.Type == RequestType.TvShow && x.TvDbId == seriesId.ToString());
var show = TvApi.ShowLookupByTheTvDbId(seriesId); var show = await Task.Run(() => TvApi.ShowLookupByTheTvDbId(seriesId));
var seasons = TvApi.EpisodeLookup(show.id); var seasons = await Task.Run(() => TvApi.EpisodeLookup(show.id));
foreach (var ep in seasons) foreach (var ep in seasons)
@ -957,7 +957,8 @@ namespace PlexRequests.UI.Modules
SeasonNumber = ep.season, SeasonNumber = ep.season,
EpisodeNumber = ep.number, EpisodeNumber = ep.number,
Requested = requested ?? false, Requested = requested ?? false,
Name = ep.name Name = ep.name,
EpisodeId = ep.id
}); });
} }

2
PlexRequests.UI/Resources/UI.resx
View file

@ -231,7 +231,7 @@
<value>Latest Season</value> <value>Latest Season</value>
</data> </data>
<data name="Search_SelectSeason" xml:space="preserve"> <data name="Search_SelectSeason" xml:space="preserve">
<value>Select </value> <value>Select Season</value>
</data> </data>
<data name="Search_ReportIssue" xml:space="preserve"> <data name="Search_ReportIssue" xml:space="preserve">
<value>Report Issue</value> <value>Report Issue</value>

2
PlexRequests.UI/Resources/UI1.Designer.cs generated
View file

@ -898,7 +898,7 @@ namespace PlexRequests.UI.Resources {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Select . /// Looks up a localized string similar to Select Season.
/// </summary> /// </summary>
public static string Search_SelectSeason { public static string Search_SelectSeason {
get { get {

4
PlexRequests.UI/Views/Search/Index.cshtml
View file

@ -366,9 +366,9 @@
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<div class="checkbox" style="margin-bottom:0px; margin-top:0px;"> <div class="checkbox" style="margin-bottom:0px; margin-top:0px;">
{{#if_eq requested true}} {{#if_eq requested true}}
<input type="checkbox" checked="checked" disabled="disabled" class="selectedEpisodes" id="{{id}}" epNumber="{{number}}" epSeason="{{season}}" name="{{id}}"><label for="{{id}}">{{number}}. {{name}}</label> <input type="checkbox" checked="checked" disabled="disabled" class="selectedEpisodes" id="{{episodeId}}" epNumber="{{number}}" epSeason="{{season}}" name="{{episodeId}}"><label for="{{episodeId}}">{{number}}. {{name}}</label>
{{else}} {{else}}
<input type="checkbox" class="selectedEpisodes" id="{{id}}" epNumber="{{number}}" epSeason="{{season}}" name="{{id}}"><label for="{{id}}">{{number}}. {{name}}</label> <input type="checkbox" class="selectedEpisodes" id="{{episodeId}}" epNumber="{{number}}" epSeason="{{season}}" name="{{episodeId}}"><label for="{{episodeId}}">{{number}}. {{name}}</label>
{{/if_eq}} {{/if_eq}}
</div> </div>
</div> </div>