github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 21:33:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git

Browse source
This commit is contained in:
Jamie.Rees 2017-01-11 08:18:35 +00:00
commit d6fa9f8af7
5 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Ombi.Store/Repository/PlexUserRepository.cs
View file

@ -48,21 +48,24 @@ namespace Ombi.Store.Repository
public PlexUsers GetUser(string userGuid) public PlexUsers GetUser(string userGuid)
{ {
var sql = @"SELECT * FROM PlexUsers var sql = @"SELECT * FROM PlexUsers
WHERE PlexUserId = @UserGuid"; WHERE PlexUserId = @UserGuid
COLLATE NOCASE";
return Db.QueryFirstOrDefault<PlexUsers>(sql, new {UserGuid = userGuid}); return Db.QueryFirstOrDefault<PlexUsers>(sql, new {UserGuid = userGuid});
} }
public PlexUsers GetUserByUsername(string username) public PlexUsers GetUserByUsername(string username)
{ {
var sql = @"SELECT * FROM PlexUsers var sql = @"SELECT * FROM PlexUsers
WHERE Username = @UserName"; WHERE Username = @UserName
COLLATE NOCASE";
return Db.QueryFirstOrDefault<PlexUsers>(sql, new {UserName = username}); return Db.QueryFirstOrDefault<PlexUsers>(sql, new {UserName = username});
} }
public async Task<PlexUsers> GetUserAsync(string userguid) public async Task<PlexUsers> GetUserAsync(string userguid)
{ {
var sql = @"SELECT * FROM PlexUsers var sql = @"SELECT * FROM PlexUsers
WHERE PlexUserId = @UserGuid"; WHERE PlexUserId = @UserGuid
COLLATE NOCASE";
return await Db.QueryFirstOrDefaultAsync<PlexUsers>(sql, new {UserGuid = userguid}); return await Db.QueryFirstOrDefaultAsync<PlexUsers>(sql, new {UserGuid = userguid});
} }

5
Ombi.UI/Content/search.js
View file

@ -83,7 +83,7 @@ $(function () {
}); });
// Click TV dropdown option // Click TV dropdown option
$(document).on("click", ".dropdownTv", function (e) { $(document).on("click", ".requestTv", function (e) {
e.preventDefault(); e.preventDefault();
var buttonId = e.target.id; var buttonId = e.target.id;
if ($("#" + buttonId).attr('disabled')) { if ($("#" + buttonId).attr('disabled')) {
@ -429,7 +429,8 @@ $(function () {
url: result.plexUrl, url: result.plexUrl,
tvPartialAvailable: result.tvPartialAvailable, tvPartialAvailable: result.tvPartialAvailable,
disableTvRequestsByEpisode: result.disableTvRequestsByEpisode, disableTvRequestsByEpisode: result.disableTvRequestsByEpisode,
disableTvRequestsBySeason: result.disableTvRequestsBySeason disableTvRequestsBySeason: result.disableTvRequestsBySeason,
enableTvRequestsForOnlySeries: result.enableTvRequestsForOnlySeries
}; };
return context; return context;

1
Ombi.UI/Models/SearchTvShowViewModel.cs
View file

@ -57,5 +57,6 @@ namespace Ombi.UI.Models
public bool TvFullyAvailable { get; set; } public bool TvFullyAvailable { get; set; }
public bool DisableTvRequestsByEpisode { get; set; } public bool DisableTvRequestsByEpisode { get; set; }
public bool DisableTvRequestsBySeason { get; set; } public bool DisableTvRequestsBySeason { get; set; }
public bool EnableTvRequestsForOnlySeries { get; set; }
} }
} }

3
Ombi.UI/Modules/SearchModule.cs
View file

@ -366,7 +366,8 @@ namespace Ombi.UI.Modules
SeriesName = t.show.name, SeriesName = t.show.name,
Status = t.show.status, Status = t.show.status,
DisableTvRequestsByEpisode = prSettings.DisableTvRequestsByEpisode, DisableTvRequestsByEpisode = prSettings.DisableTvRequestsByEpisode,
DisableTvRequestsBySeason = prSettings.DisableTvRequestsBySeason DisableTvRequestsBySeason = prSettings.DisableTvRequestsBySeason,
EnableTvRequestsForOnlySeries = (prSettings.DisableTvRequestsByEpisode && prSettings.DisableTvRequestsBySeason)
}; };

38
Ombi.UI/Views/Search/Index.cshtml
View file

@ -175,23 +175,27 @@
@*//TODO Not used yet*@ @*//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 /> <button style="text-align: right" class="btn btn-success-outline disabled" disabled><i class="fa fa-check"></i> @UI.Search_Available</button><br />
{{else}} {{else}}
<div class="dropdown"> {{#if_eq enableTvRequestsForOnlySeries true}}
<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"> <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>
<i class="fa fa-plus"></i> {{#if available}}@UI.Search_Available{{else}}@UI.Search_Request {{/if}} {{else}}
<span class="caret"></span> <div class="dropdown">
</button> <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">
<ul class="dropdown-menu" aria-labelledby="dropdownMenu1"> <i class="fa fa-plus"></i> {{#if available}}@UI.Search_Available{{else}}@UI.Search_Request {{/if}}
<li><a id="{{id}}" season-select="0" class="dropdownTv " href="#">@UI.Search_AllSeasons</a></li> <span class="caret"></span>
{{#if_eq disableTvRequestsBySeason false}} </button>
<li><a id="{{id}}" season-select="1" class="dropdownTv" href="#">@UI.Search_FirstSeason</a></li> <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
<li><a id="{{id}}" season-select="2" class="dropdownTv" href="#">@UI.Search_LatestSeason</a></li> <li><a id="{{id}}" season-select="0" class="dropdownTv " href="#">@UI.Search_AllSeasons</a></li>
<li><a id="SeasonSelect" data-identifier="{{id}}" data-toggle="modal" data-target="#seasonsModal" href="#">@UI.Search_SelectSeason...</a></li> {{#if_eq disableTvRequestsBySeason false}}
{{/if_eq}} <li><a id="{{id}}" season-select="1" class="dropdownTv" href="#">@UI.Search_FirstSeason</a></li>
{{#if_eq disableTvRequestsByEpisode false}} <li><a id="{{id}}" season-select="2" class="dropdownTv" href="#">@UI.Search_LatestSeason</a></li>
<li><a id="EpisodeSelect" data-identifier="{{id}}" data-toggle="modal" data-target="#episodesModal" href="#">@UI.Search_SelectEpisode...</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}}
</ul> {{#if_eq disableTvRequestsByEpisode false}}
</div> <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 available}}
<br /> <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> <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>