mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-21 05:00:39 +02:00
added live tv suggested page
This commit is contained in:
parent
aec872609e
commit
8ade5b51f3
|
@ -27,6 +27,9 @@ namespace MediaBrowser.Api
|
||||||
|
|
||||||
[ApiMember(Name = "ControllableByUserId", Description = "Optional. Filter by sessions that a given user is allowed to remote control.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
|
[ApiMember(Name = "ControllableByUserId", Description = "Optional. Filter by sessions that a given user is allowed to remote control.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
|
||||||
public Guid? ControllableByUserId { get; set; }
|
public Guid? ControllableByUserId { get; set; }
|
||||||
|
|
||||||
|
[ApiMember(Name = "DeviceId", Description = "Optional. Filter by device id.", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")]
|
||||||
|
public string DeviceId { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -248,6 +251,11 @@ namespace MediaBrowser.Api
|
||||||
result = result.Where(i => i.SupportsRemoteControl == request.SupportsRemoteControl.Value);
|
result = result.Where(i => i.SupportsRemoteControl == request.SupportsRemoteControl.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(request.DeviceId))
|
||||||
|
{
|
||||||
|
result = result.Where(i => string.Equals(i.DeviceId, request.DeviceId, StringComparison.OrdinalIgnoreCase));
|
||||||
|
}
|
||||||
|
|
||||||
if (request.ControllableByUserId.HasValue)
|
if (request.ControllableByUserId.HasValue)
|
||||||
{
|
{
|
||||||
var user = _userManager.GetUserById(request.ControllableByUserId.Value);
|
var user = _userManager.GetUserById(request.ControllableByUserId.Value);
|
||||||
|
|
|
@ -503,6 +503,7 @@ namespace MediaBrowser.WebDashboard.Api
|
||||||
"livetvtimer.js",
|
"livetvtimer.js",
|
||||||
"livetvseriestimer.js",
|
"livetvseriestimer.js",
|
||||||
"livetvseriestimers.js",
|
"livetvseriestimers.js",
|
||||||
|
"livetvsuggested.js",
|
||||||
"livetvtimers.js",
|
"livetvtimers.js",
|
||||||
"loginpage.js",
|
"loginpage.js",
|
||||||
"logpage.js",
|
"logpage.js",
|
||||||
|
|
|
@ -448,6 +448,9 @@
|
||||||
<Content Include="dashboard-ui\scripts\livetvseriestimers.js">
|
<Content Include="dashboard-ui\scripts\livetvseriestimers.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="dashboard-ui\scripts\livetvsuggested.js">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="dashboard-ui\scripts\tvupcoming.js">
|
<Content Include="dashboard-ui\scripts\tvupcoming.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
@ -1090,6 +1093,9 @@
|
||||||
<Content Include="dashboard-ui\thirdparty\jstree1.0\jquery.jstree.min.js">
|
<Content Include="dashboard-ui\thirdparty\jstree1.0\jquery.jstree.min.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="dashboard-ui\livetvsuggested.html">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="dashboard-ui\tvupcoming.html">
|
<Content Include="dashboard-ui\tvupcoming.html">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
|
Loading…
Reference in a new issue