mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-07-16 02:02:55 -07:00
Jamie
GitHub
commit
7e6824c252
16 changed files with 417 additions and 269 deletions
23
CHANGELOG.md
23
CHANGELOG.md
|
|
@ -1,5 +1,28 @@
|
|||
# Changelog
|
||||
|
||||
## (unreleased)
|
||||
|
||||
### **Fixes**
|
||||
|
||||
- Small memory improvements in the Plex Sync. [Jamie]
|
||||
|
||||
- Fixed the sort issue on the user Management page. Also added sorting to the Movie Requests page. [tidusjar]
|
||||
|
||||
- Downgraded the angular2-jwt library since it has a bug in it. #2064. [tidusjar]
|
||||
|
||||
- Fixed an issue when Plex decideds to reuse the Plex Key for a different media item... #2038. [tidusjar]
|
||||
|
||||
- Fixed an issue where we might show the Imdb link when we do not have a imdbid #1797. [tidusjar]
|
||||
|
||||
- Fixed the issue where we can no longer select Pending Approval in the filters #2057. [tidusjar]
|
||||
|
||||
- Fixed the API key not working when attempting to get requests #2058. [tidusjar]
|
||||
|
||||
- Fixed #2056. [tidusjar]
|
||||
|
||||
- Experimental, set the Webpack base root to the ombi base path if we have it. This should hopefully fix the reverse proxy issues. [Jamie]
|
||||
|
||||
|
||||
## v3.0.3000 (2018-03-09)
|
||||
|
||||
### **New Features**
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using Ombi.Core.Rule;
|
||||
using System;
|
||||
using Ombi.Core.Rule;
|
||||
using System.Collections.Generic;
|
||||
using System.Security.Principal;
|
||||
using System.Threading.Tasks;
|
||||
|
|
@ -10,6 +11,7 @@ using Microsoft.AspNetCore.Identity;
|
|||
using System.Linq;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Ombi.Core.Authentication;
|
||||
using Ombi.Helpers;
|
||||
|
||||
namespace Ombi.Core.Engine.Interfaces
|
||||
{
|
||||
|
|
@ -30,6 +32,13 @@ namespace Ombi.Core.Engine.Interfaces
|
|||
private OmbiUser _user;
|
||||
protected async Task<OmbiUser> GetUser()
|
||||
{
|
||||
if (IsApiUser)
|
||||
{
|
||||
return new OmbiUser
|
||||
{
|
||||
UserName = Username,
|
||||
};
|
||||
}
|
||||
return _user ?? (_user = await UserManager.Users.FirstOrDefaultAsync(x => x.UserName == Username));
|
||||
}
|
||||
|
||||
|
|
@ -40,6 +49,10 @@ namespace Ombi.Core.Engine.Interfaces
|
|||
|
||||
protected async Task<bool> IsInRole(string roleName)
|
||||
{
|
||||
if (IsApiUser && roleName != OmbiRoles.Disabled)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return await UserManager.IsInRoleAsync(await GetUser(), roleName);
|
||||
}
|
||||
|
||||
|
|
@ -59,5 +72,7 @@ namespace Ombi.Core.Engine.Interfaces
|
|||
var ruleResults = await Rules.StartSpecificRules(model, rule);
|
||||
return ruleResults;
|
||||
}
|
||||
|
||||
private bool IsApiUser => Username.Equals("Api", StringComparison.CurrentCultureIgnoreCase);
|
||||
}
|
||||
}
|
||||
|
|
@ -93,217 +93,155 @@ namespace Ombi.Schedule.Jobs.Plex
|
|||
{
|
||||
foreach (var servers in plexSettings.Servers ?? new List<PlexServers>())
|
||||
{
|
||||
|
||||
Logger.LogInformation("Getting all content from server {0}", servers.Name);
|
||||
var allContent = await GetAllContent(servers);
|
||||
Logger.LogInformation("We found {0} items", allContent.Count);
|
||||
|
||||
// Let's now process this.
|
||||
var contentToAdd = new List<PlexServerContent>();
|
||||
foreach (var content in allContent)
|
||||
try
|
||||
{
|
||||
if (content.viewGroup.Equals(PlexMediaType.Show.ToString(), StringComparison.CurrentCultureIgnoreCase))
|
||||
Logger.LogInformation("Starting to cache the content on server {0}", servers.Name);
|
||||
await ProcessServer(servers);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.LogWarning(LoggingEvents.PlexContentCacher, e, "Exception thrown when attempting to cache the Plex Content in server {0}", servers.Name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private async Task ProcessServer(PlexServers servers)
|
||||
{
|
||||
Logger.LogInformation("Getting all content from server {0}", servers.Name);
|
||||
var allContent = await GetAllContent(servers);
|
||||
Logger.LogInformation("We found {0} items", allContent.Count);
|
||||
|
||||
// Let's now process this.
|
||||
var contentToAdd = new HashSet<PlexServerContent>();
|
||||
foreach (var content in allContent)
|
||||
{
|
||||
if (content.viewGroup.Equals(PlexMediaType.Show.ToString(), StringComparison.CurrentCultureIgnoreCase))
|
||||
{
|
||||
// Process Shows
|
||||
Logger.LogInformation("Processing TV Shows");
|
||||
foreach (var show in content.Metadata ?? new Metadata[] { })
|
||||
{
|
||||
// Process Shows
|
||||
Logger.LogInformation("Processing TV Shows");
|
||||
foreach (var show in content.Metadata ?? new Metadata[] { })
|
||||
var seasonList = await PlexApi.GetSeasons(servers.PlexAuthToken, servers.FullUri,
|
||||
show.ratingKey);
|
||||
var seasonsContent = new List<PlexSeasonsContent>();
|
||||
foreach (var season in seasonList.MediaContainer.Metadata)
|
||||
{
|
||||
var seasonList = await PlexApi.GetSeasons(servers.PlexAuthToken, servers.FullUri,
|
||||
show.ratingKey);
|
||||
var seasonsContent = new List<PlexSeasonsContent>();
|
||||
foreach (var season in seasonList.MediaContainer.Metadata)
|
||||
seasonsContent.Add(new PlexSeasonsContent
|
||||
{
|
||||
seasonsContent.Add(new PlexSeasonsContent
|
||||
{
|
||||
ParentKey = season.parentRatingKey,
|
||||
SeasonKey = season.ratingKey,
|
||||
SeasonNumber = season.index,
|
||||
PlexContentId = show.ratingKey
|
||||
});
|
||||
ParentKey = season.parentRatingKey,
|
||||
SeasonKey = season.ratingKey,
|
||||
SeasonNumber = season.index,
|
||||
PlexContentId = show.ratingKey
|
||||
});
|
||||
}
|
||||
|
||||
// Do we already have this item?
|
||||
// Let's try and match
|
||||
var existingContent = await Repo.GetFirstContentByCustom(x => x.Title == show.title
|
||||
&& x.ReleaseYear == show.year.ToString()
|
||||
&& x.Type == PlexMediaTypeEntity.Show);
|
||||
|
||||
// Just double check the rating key, since this is our unique constraint
|
||||
var existingKey = await Repo.GetByKey(show.ratingKey);
|
||||
|
||||
if (existingKey != null)
|
||||
{
|
||||
// Damn son.
|
||||
// Let's check if they match up
|
||||
var doesMatch = show.title.Equals(existingKey.Title,
|
||||
StringComparison.CurrentCulture);
|
||||
if (!doesMatch)
|
||||
{
|
||||
// Something fucked up on Plex at somepoint... Damn, rebuild of lib maybe?
|
||||
// Lets delete the matching key
|
||||
await Repo.Delete(existingKey);
|
||||
existingKey = null;
|
||||
}
|
||||
}
|
||||
|
||||
// Do we already have this item?
|
||||
// Let's try and match
|
||||
var existingContent = await Repo.GetFirstContentByCustom(x => x.Title == show.title
|
||||
&& x.ReleaseYear == show.year.ToString()
|
||||
&& x.Type == PlexMediaTypeEntity.Show);
|
||||
|
||||
if (existingContent != null)
|
||||
if (existingContent != null)
|
||||
{
|
||||
// Just check the key
|
||||
if (existingKey != null)
|
||||
{
|
||||
// Just check the key
|
||||
var existingKey = await Repo.GetByKey(show.ratingKey);
|
||||
if (existingKey != null)
|
||||
{
|
||||
// The rating key is all good!
|
||||
}
|
||||
else
|
||||
{
|
||||
// This means the rating key has changed somehow.
|
||||
// Should probably delete this and get the new one
|
||||
var oldKey = existingContent.Key;
|
||||
Repo.DeleteWithoutSave(existingContent);
|
||||
|
||||
// Because we have changed the rating key, we need to change all children too
|
||||
var episodeToChange = Repo.GetAllEpisodes().Where(x => x.GrandparentKey == oldKey);
|
||||
if (episodeToChange.Any())
|
||||
{
|
||||
foreach (var e in episodeToChange)
|
||||
{
|
||||
Repo.DeleteWithoutSave(e);
|
||||
}
|
||||
}
|
||||
await Repo.SaveChangesAsync();
|
||||
existingContent = null;
|
||||
}
|
||||
|
||||
}
|
||||
// The ratingKey keeps changing...
|
||||
//var existingContent = await Repo.GetByKey(show.ratingKey);
|
||||
if (existingContent != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
Logger.LogInformation("We already have show {0} checking for new seasons", existingContent.Title);
|
||||
// Ok so we have it, let's check if there are any new seasons
|
||||
var itemAdded = false;
|
||||
foreach (var season in seasonsContent)
|
||||
{
|
||||
var seasonExists = existingContent.Seasons.FirstOrDefault(x => x.SeasonKey == season.SeasonKey);
|
||||
|
||||
if (seasonExists != null)
|
||||
{
|
||||
// We already have this season
|
||||
continue;
|
||||
}
|
||||
|
||||
existingContent.Seasons.Add(season);
|
||||
itemAdded = true;
|
||||
}
|
||||
|
||||
if (itemAdded) await Repo.Update(existingContent);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.LogError(LoggingEvents.PlexContentCacher, e, "Exception when adding new seasons to title {0}", existingContent.Title);
|
||||
}
|
||||
// The rating key is all good!
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
// This means the rating key has changed somehow.
|
||||
// Should probably delete this and get the new one
|
||||
var oldKey = existingContent.Key;
|
||||
Repo.DeleteWithoutSave(existingContent);
|
||||
|
||||
// Because we have changed the rating key, we need to change all children too
|
||||
var episodeToChange = Repo.GetAllEpisodes().Where(x => x.GrandparentKey == oldKey);
|
||||
if (episodeToChange.Any())
|
||||
{
|
||||
foreach (var e in episodeToChange)
|
||||
{
|
||||
Repo.DeleteWithoutSave(e);
|
||||
}
|
||||
}
|
||||
await Repo.SaveChangesAsync();
|
||||
existingContent = null;
|
||||
}
|
||||
}
|
||||
// The ratingKey keeps changing...
|
||||
//var existingContent = await Repo.GetByKey(show.ratingKey);
|
||||
if (existingContent != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
Logger.LogInformation("We already have show {0} checking for new seasons",
|
||||
existingContent.Title);
|
||||
// Ok so we have it, let's check if there are any new seasons
|
||||
var itemAdded = false;
|
||||
foreach (var season in seasonsContent)
|
||||
{
|
||||
var seasonExists =
|
||||
existingContent.Seasons.FirstOrDefault(x => x.SeasonKey == season.SeasonKey);
|
||||
|
||||
Logger.LogInformation("New show {0}, so add it", show.title);
|
||||
|
||||
// Get the show metadata... This sucks since the `metadata` var contains all information about the show
|
||||
// But it does not contain the `guid` property that we need to pull out thetvdb id...
|
||||
var showMetadata = await PlexApi.GetMetadata(servers.PlexAuthToken, servers.FullUri,
|
||||
show.ratingKey);
|
||||
var providerIds = PlexHelper.GetProviderIdFromPlexGuid(showMetadata.MediaContainer.Metadata.FirstOrDefault().guid);
|
||||
|
||||
var item = new PlexServerContent
|
||||
if (seasonExists != null)
|
||||
{
|
||||
AddedAt = DateTime.Now,
|
||||
Key = show.ratingKey,
|
||||
ReleaseYear = show.year.ToString(),
|
||||
Type = PlexMediaTypeEntity.Show,
|
||||
Title = show.title,
|
||||
Url = PlexHelper.GetPlexMediaUrl(servers.MachineIdentifier, show.ratingKey),
|
||||
Seasons = new List<PlexSeasonsContent>()
|
||||
};
|
||||
if (providerIds.Type == ProviderType.ImdbId)
|
||||
{
|
||||
item.ImdbId = providerIds.ImdbId;
|
||||
}
|
||||
if (providerIds.Type == ProviderType.TheMovieDbId)
|
||||
{
|
||||
item.TheMovieDbId = providerIds.TheMovieDb;
|
||||
}
|
||||
if (providerIds.Type == ProviderType.TvDbId)
|
||||
{
|
||||
item.TvDbId = providerIds.TheTvDb;
|
||||
}
|
||||
|
||||
// Let's just double check to make sure we do not have it now we have some id's
|
||||
var existingImdb = false;
|
||||
var existingMovieDbId = false;
|
||||
var existingTvDbId = false;
|
||||
if (item.ImdbId.HasValue())
|
||||
{
|
||||
existingImdb = await Repo.GetAll().AnyAsync(x =>
|
||||
x.ImdbId == item.ImdbId && x.Type == PlexMediaTypeEntity.Show);
|
||||
}
|
||||
if (item.TheMovieDbId.HasValue())
|
||||
{
|
||||
existingMovieDbId = await Repo.GetAll().AnyAsync(x =>
|
||||
x.TheMovieDbId == item.TheMovieDbId && x.Type == PlexMediaTypeEntity.Show);
|
||||
}
|
||||
if (item.TvDbId.HasValue())
|
||||
{
|
||||
existingTvDbId = await Repo.GetAll().AnyAsync(x =>
|
||||
x.TvDbId == item.TvDbId && x.Type == PlexMediaTypeEntity.Show);
|
||||
}
|
||||
if (existingImdb || existingTvDbId || existingMovieDbId)
|
||||
{
|
||||
// We already have it!
|
||||
// We already have this season
|
||||
continue;
|
||||
}
|
||||
|
||||
item.Seasons.ToList().AddRange(seasonsContent);
|
||||
|
||||
contentToAdd.Add(item);
|
||||
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.LogError(LoggingEvents.PlexContentCacher, e, "Exception when adding tv show {0}", show.title);
|
||||
existingContent.Seasons.Add(season);
|
||||
itemAdded = true;
|
||||
}
|
||||
|
||||
if (itemAdded) await Repo.Update(existingContent);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.LogError(LoggingEvents.PlexContentCacher, e,
|
||||
"Exception when adding new seasons to title {0}", existingContent.Title);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (content.viewGroup.Equals(PlexMediaType.Movie.ToString(), StringComparison.CurrentCultureIgnoreCase))
|
||||
{
|
||||
Logger.LogInformation("Processing Movies");
|
||||
foreach (var movie in content?.Metadata ?? new Metadata[] { })
|
||||
else
|
||||
{
|
||||
// Let's check if we have this movie
|
||||
|
||||
try
|
||||
{
|
||||
var existing = await Repo.GetFirstContentByCustom(x => x.Title == movie.title
|
||||
&& x.ReleaseYear == movie.year.ToString()
|
||||
&& x.Type == PlexMediaTypeEntity.Movie);
|
||||
// The rating key keeps changing
|
||||
//var existing = await Repo.GetByKey(movie.ratingKey);
|
||||
if (existing != null)
|
||||
{
|
||||
Logger.LogInformation("We already have movie {0}", movie.title);
|
||||
continue;
|
||||
}
|
||||
Logger.LogInformation("New show {0}, so add it", show.title);
|
||||
|
||||
var hasSameKey = await Repo.GetByKey(movie.ratingKey);
|
||||
if (hasSameKey != null)
|
||||
{
|
||||
await Repo.Delete(hasSameKey);
|
||||
}
|
||||
|
||||
Logger.LogInformation("Adding movie {0}", movie.title);
|
||||
var metaData = await PlexApi.GetMetadata(servers.PlexAuthToken, servers.FullUri,
|
||||
movie.ratingKey);
|
||||
var providerIds = PlexHelper.GetProviderIdFromPlexGuid(metaData.MediaContainer.Metadata
|
||||
.FirstOrDefault()
|
||||
.guid);
|
||||
// Get the show metadata... This sucks since the `metadata` var contains all information about the show
|
||||
// But it does not contain the `guid` property that we need to pull out thetvdb id...
|
||||
var showMetadata = await PlexApi.GetMetadata(servers.PlexAuthToken, servers.FullUri,
|
||||
show.ratingKey);
|
||||
var providerIds =
|
||||
PlexHelper.GetProviderIdFromPlexGuid(showMetadata.MediaContainer.Metadata.FirstOrDefault()
|
||||
.guid);
|
||||
|
||||
var item = new PlexServerContent
|
||||
{
|
||||
AddedAt = DateTime.Now,
|
||||
Key = movie.ratingKey,
|
||||
ReleaseYear = movie.year.ToString(),
|
||||
Type = PlexMediaTypeEntity.Movie,
|
||||
Title = movie.title,
|
||||
Url = PlexHelper.GetPlexMediaUrl(servers.MachineIdentifier, movie.ratingKey),
|
||||
Seasons = new List<PlexSeasonsContent>(),
|
||||
Quality = movie.Media?.FirstOrDefault()?.videoResolution ?? string.Empty
|
||||
Key = show.ratingKey,
|
||||
ReleaseYear = show.year.ToString(),
|
||||
Type = PlexMediaTypeEntity.Show,
|
||||
Title = show.title,
|
||||
Url = PlexHelper.GetPlexMediaUrl(servers.MachineIdentifier, show.ratingKey),
|
||||
Seasons = new List<PlexSeasonsContent>()
|
||||
};
|
||||
if (providerIds.Type == ProviderType.ImdbId)
|
||||
{
|
||||
|
|
@ -317,26 +255,130 @@ namespace Ombi.Schedule.Jobs.Plex
|
|||
{
|
||||
item.TvDbId = providerIds.TheTvDb;
|
||||
}
|
||||
|
||||
// Let's just double check to make sure we do not have it now we have some id's
|
||||
var existingImdb = false;
|
||||
var existingMovieDbId = false;
|
||||
var existingTvDbId = false;
|
||||
if (item.ImdbId.HasValue())
|
||||
{
|
||||
existingImdb = await Repo.GetAll().AnyAsync(x =>
|
||||
x.ImdbId == item.ImdbId && x.Type == PlexMediaTypeEntity.Show);
|
||||
}
|
||||
if (item.TheMovieDbId.HasValue())
|
||||
{
|
||||
existingMovieDbId = await Repo.GetAll().AnyAsync(x =>
|
||||
x.TheMovieDbId == item.TheMovieDbId && x.Type == PlexMediaTypeEntity.Show);
|
||||
}
|
||||
if (item.TvDbId.HasValue())
|
||||
{
|
||||
existingTvDbId = await Repo.GetAll().AnyAsync(x =>
|
||||
x.TvDbId == item.TvDbId && x.Type == PlexMediaTypeEntity.Show);
|
||||
}
|
||||
if (existingImdb || existingTvDbId || existingMovieDbId)
|
||||
{
|
||||
// We already have it!
|
||||
continue;
|
||||
}
|
||||
|
||||
item.Seasons.ToList().AddRange(seasonsContent);
|
||||
|
||||
contentToAdd.Add(item);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.LogError(LoggingEvents.PlexContentCacher, e, "Exception when adding new Movie {0}", movie.title);
|
||||
Logger.LogError(LoggingEvents.PlexContentCacher, e, "Exception when adding tv show {0}",
|
||||
show.title);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (contentToAdd.Count > 500)
|
||||
{
|
||||
await Repo.AddRange(contentToAdd);
|
||||
contentToAdd = new List<PlexServerContent>();
|
||||
if (contentToAdd.Count > 500)
|
||||
{
|
||||
await Repo.AddRange(contentToAdd);
|
||||
contentToAdd.Clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (content.viewGroup.Equals(PlexMediaType.Movie.ToString(), StringComparison.CurrentCultureIgnoreCase))
|
||||
{
|
||||
Logger.LogInformation("Processing Movies");
|
||||
foreach (var movie in content?.Metadata ?? new Metadata[] { })
|
||||
{
|
||||
// Let's check if we have this movie
|
||||
|
||||
if (contentToAdd.Any())
|
||||
try
|
||||
{
|
||||
var existing = await Repo.GetFirstContentByCustom(x => x.Title == movie.title
|
||||
&& x.ReleaseYear == movie.year.ToString()
|
||||
&& x.Type == PlexMediaTypeEntity.Movie);
|
||||
// The rating key keeps changing
|
||||
//var existing = await Repo.GetByKey(movie.ratingKey);
|
||||
if (existing != null)
|
||||
{
|
||||
Logger.LogInformation("We already have movie {0}", movie.title);
|
||||
continue;
|
||||
}
|
||||
|
||||
var hasSameKey = await Repo.GetByKey(movie.ratingKey);
|
||||
if (hasSameKey != null)
|
||||
{
|
||||
await Repo.Delete(hasSameKey);
|
||||
}
|
||||
|
||||
Logger.LogInformation("Adding movie {0}", movie.title);
|
||||
var metaData = await PlexApi.GetMetadata(servers.PlexAuthToken, servers.FullUri,
|
||||
movie.ratingKey);
|
||||
var providerIds = PlexHelper.GetProviderIdFromPlexGuid(metaData.MediaContainer.Metadata
|
||||
.FirstOrDefault()
|
||||
.guid);
|
||||
|
||||
var item = new PlexServerContent
|
||||
{
|
||||
AddedAt = DateTime.Now,
|
||||
Key = movie.ratingKey,
|
||||
ReleaseYear = movie.year.ToString(),
|
||||
Type = PlexMediaTypeEntity.Movie,
|
||||
Title = movie.title,
|
||||
Url = PlexHelper.GetPlexMediaUrl(servers.MachineIdentifier, movie.ratingKey),
|
||||
Seasons = new List<PlexSeasonsContent>(),
|
||||
Quality = movie.Media?.FirstOrDefault()?.videoResolution ?? string.Empty
|
||||
};
|
||||
if (providerIds.Type == ProviderType.ImdbId)
|
||||
{
|
||||
item.ImdbId = providerIds.ImdbId;
|
||||
}
|
||||
if (providerIds.Type == ProviderType.TheMovieDbId)
|
||||
{
|
||||
item.TheMovieDbId = providerIds.TheMovieDb;
|
||||
}
|
||||
if (providerIds.Type == ProviderType.TvDbId)
|
||||
{
|
||||
item.TvDbId = providerIds.TheTvDb;
|
||||
}
|
||||
contentToAdd.Add(item);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.LogError(LoggingEvents.PlexContentCacher, e, "Exception when adding new Movie {0}",
|
||||
movie.title);
|
||||
}
|
||||
|
||||
if (contentToAdd.Count > 500)
|
||||
{
|
||||
await Repo.AddRange(contentToAdd);
|
||||
contentToAdd.Clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (contentToAdd.Count > 500)
|
||||
{
|
||||
await Repo.AddRange(contentToAdd);
|
||||
contentToAdd.Clear();
|
||||
}
|
||||
}
|
||||
|
||||
if (contentToAdd.Any())
|
||||
{
|
||||
await Repo.AddRange(contentToAdd);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ namespace Ombi.Schedule.Jobs.Plex
|
|||
{
|
||||
if (!Validate(settings))
|
||||
{
|
||||
|
||||
_log.LogWarning("Validation failed");
|
||||
return;
|
||||
}
|
||||
|
|
@ -101,21 +100,25 @@ namespace Ombi.Schedule.Jobs.Plex
|
|||
{
|
||||
var currentPosition = 0;
|
||||
var resultCount = settings.EpisodeBatchSize == 0 ? 150 : settings.EpisodeBatchSize;
|
||||
var currentEpisodes = _repo.GetAllEpisodes();
|
||||
var episodes = await _api.GetAllEpisodes(settings.PlexAuthToken, settings.FullUri, section.key, currentPosition, resultCount);
|
||||
_log.LogInformation(LoggingEvents.PlexEpisodeCacher, $"Total Epsiodes found for {episodes.MediaContainer.librarySectionTitle} = {episodes.MediaContainer.totalSize}");
|
||||
|
||||
// Delete all the episodes because we cannot uniquly match an episode to series every time,
|
||||
// see comment below.
|
||||
await _repo.ExecuteSql("DELETE FROM PlexEpisode");
|
||||
|
||||
await ProcessEpsiodes(episodes);
|
||||
// 12.03.2017 - I think we should be able to match them now
|
||||
//await _repo.ExecuteSql("DELETE FROM PlexEpisode");
|
||||
|
||||
await ProcessEpsiodes(episodes, currentEpisodes);
|
||||
currentPosition += resultCount;
|
||||
|
||||
while (currentPosition < episodes.MediaContainer.totalSize)
|
||||
{
|
||||
var ep = await _api.GetAllEpisodes(settings.PlexAuthToken, settings.FullUri, section.key, currentPosition,
|
||||
resultCount);
|
||||
await ProcessEpsiodes(ep);
|
||||
|
||||
await ProcessEpsiodes(ep, currentEpisodes);
|
||||
_log.LogInformation(LoggingEvents.PlexEpisodeCacher, $"Processed {resultCount} more episodes. Total Remaining {episodes.MediaContainer.totalSize - currentPosition}");
|
||||
currentPosition += resultCount;
|
||||
}
|
||||
|
|
@ -125,58 +128,56 @@ namespace Ombi.Schedule.Jobs.Plex
|
|||
await _repo.SaveChangesAsync();
|
||||
}
|
||||
|
||||
private async Task ProcessEpsiodes(PlexContainer episodes)
|
||||
private async Task ProcessEpsiodes(PlexContainer episodes, IQueryable<PlexEpisode> currentEpisodes)
|
||||
{
|
||||
var ep = new HashSet<PlexEpisode>();
|
||||
try
|
||||
{
|
||||
|
||||
|
||||
foreach (var episode in episodes?.MediaContainer?.Metadata ?? new Metadata[]{})
|
||||
{
|
||||
// I don't think we need to get the metadata, we only need to get the metadata if we need the provider id (TheTvDbid). Why do we need it for episodes?
|
||||
// We have the parent and grandparent rating keys to link up to the season and series
|
||||
//var metadata = _api.GetEpisodeMetaData(server.PlexAuthToken, server.FullUri, episode.ratingKey);
|
||||
|
||||
// This does seem to work, it looks like we can somehow get different rating, grandparent and parent keys with episodes. Not sure how.
|
||||
//var epExists = currentEpisodes.Any(x => episode.ratingKey == x.Key &&
|
||||
// episode.grandparentRatingKey == x.GrandparentKey);
|
||||
//if (epExists)
|
||||
//{
|
||||
// continue;
|
||||
//}
|
||||
|
||||
// Let's check if we have the parent
|
||||
var seriesExists = await _repo.GetByKey(episode.grandparentRatingKey);
|
||||
if (seriesExists == null)
|
||||
foreach (var episode in episodes?.MediaContainer?.Metadata ?? new Metadata[] { })
|
||||
{
|
||||
// Ok let's try and match it to a title. TODO (This is experimental)
|
||||
var seriesMatch = await _repo.GetAll().FirstOrDefaultAsync(x =>
|
||||
x.Title.Equals(episode.grandparentTitle, StringComparison.CurrentCultureIgnoreCase));
|
||||
if (seriesMatch == null)
|
||||
// I don't think we need to get the metadata, we only need to get the metadata if we need the provider id (TheTvDbid). Why do we need it for episodes?
|
||||
// We have the parent and grandparent rating keys to link up to the season and series
|
||||
//var metadata = _api.GetEpisodeMetaData(server.PlexAuthToken, server.FullUri, episode.ratingKey);
|
||||
|
||||
// This does seem to work, it looks like we can somehow get different rating, grandparent and parent keys with episodes. Not sure how.
|
||||
var epExists = currentEpisodes.Any(x => episode.ratingKey == x.Key &&
|
||||
episode.grandparentRatingKey == x.GrandparentKey);
|
||||
if (epExists)
|
||||
{
|
||||
_log.LogWarning(
|
||||
"The episode title {0} we cannot find the parent series. The episode grandparentKey = {1}, grandparentTitle = {2}",
|
||||
episode.title, episode.grandparentRatingKey, episode.grandparentTitle);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Set the rating key to the correct one
|
||||
episode.grandparentRatingKey = seriesMatch.Key;
|
||||
// Let's check if we have the parent
|
||||
var seriesExists = await _repo.GetByKey(episode.grandparentRatingKey);
|
||||
if (seriesExists == null)
|
||||
{
|
||||
// Ok let's try and match it to a title. TODO (This is experimental)
|
||||
seriesExists = await _repo.GetAll().FirstOrDefaultAsync(x =>
|
||||
x.Title.Equals(episode.grandparentTitle, StringComparison.CurrentCultureIgnoreCase));
|
||||
if (seriesExists == null)
|
||||
{
|
||||
_log.LogWarning(
|
||||
"The episode title {0} we cannot find the parent series. The episode grandparentKey = {1}, grandparentTitle = {2}",
|
||||
episode.title, episode.grandparentRatingKey, episode.grandparentTitle);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Set the rating key to the correct one
|
||||
episode.grandparentRatingKey = seriesExists.Key;
|
||||
}
|
||||
|
||||
ep.Add(new PlexEpisode
|
||||
{
|
||||
EpisodeNumber = episode.index,
|
||||
SeasonNumber = episode.parentIndex,
|
||||
GrandparentKey = episode.grandparentRatingKey,
|
||||
ParentKey = episode.parentRatingKey,
|
||||
Key = episode.ratingKey,
|
||||
Title = episode.title
|
||||
});
|
||||
}
|
||||
|
||||
ep.Add(new PlexEpisode
|
||||
{
|
||||
EpisodeNumber = episode.index,
|
||||
SeasonNumber = episode.parentIndex,
|
||||
GrandparentKey = episode.grandparentRatingKey,
|
||||
ParentKey = episode.parentRatingKey,
|
||||
Key = episode.ratingKey,
|
||||
Title = episode.title
|
||||
});
|
||||
}
|
||||
|
||||
await _repo.AddRange(ep);
|
||||
await _repo.AddRange(ep);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
@ -189,7 +190,7 @@ namespace Ombi.Schedule.Jobs.Plex
|
|||
{
|
||||
if (string.IsNullOrEmpty(settings.PlexAuthToken))
|
||||
{
|
||||
return false ;
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import { Component, OnInit } from "@angular/core";
|
||||
import { PlatformLocation } from "@angular/common";
|
||||
import { Component, OnInit } from "@angular/core";
|
||||
import { NavigationStart, Router } from "@angular/router";
|
||||
import { TranslateService } from "@ngx-translate/core";
|
||||
import { AuthService } from "./auth/auth.service";
|
||||
|
|
@ -32,7 +33,14 @@ export class AppComponent implements OnInit {
|
|||
private readonly settingsService: SettingsService,
|
||||
private readonly jobService: JobService,
|
||||
public readonly translate: TranslateService,
|
||||
private readonly identityService: IdentityService) {
|
||||
private readonly identityService: IdentityService,
|
||||
private readonly platformLocation: PlatformLocation) {
|
||||
|
||||
const base = this.platformLocation.getBaseHrefFromDOM();
|
||||
if (base.length > 1) {
|
||||
__webpack_public_path__ = base + "/dist/";
|
||||
}
|
||||
|
||||
this.translate.addLangs(["en", "de", "fr","da","es","it","nl","sv","no"]);
|
||||
// this language will be used as a fallback when a translation isn't found in the current language
|
||||
this.translate.setDefaultLang("en");
|
||||
|
|
|
|||
|
|
@ -13,15 +13,15 @@
|
|||
<span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
|
||||
</span>
|
||||
</th>
|
||||
<th (click)="setOrder('issue.status')">
|
||||
<th (click)="setOrder('status')">
|
||||
<a [translate]="'Issues.Status'"></a>
|
||||
<span *ngIf="order === 'issue.status'">
|
||||
<span *ngIf="order === 'status'">
|
||||
<span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
|
||||
</span>
|
||||
</th>
|
||||
<th (click)="setOrder('issue.reportedUser')">
|
||||
<th (click)="setOrder('reportedUser')">
|
||||
<a [translate]="'Issues.ReportedBy'"></a>
|
||||
<span *ngIf="order === 'issue.reportedUser'">
|
||||
<span *ngIf="order === 'reportedUser'">
|
||||
<span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
|
||||
</span>
|
||||
</th>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,49 @@
|
|||
<input type="text" id="search" class="form-control form-control-custom searchwidth" placeholder="Search" (keyup)="search($event)">
|
||||
<span class="input-group-btn">
|
||||
<button id="filterBtn" class="btn btn-sm btn-info-outline" (click)="filterDisplay = !filterDisplay" >
|
||||
<i class="fa fa-filter"></i> {{ 'Requests.Filter' | translate }}</button>
|
||||
<!-- <button id="filterBtn" class="btn btn-sm btn-warning-outline" (click)="sortDisplay = !sortDisplay" >
|
||||
<i class="fa fa-sort"></i> {{ 'Requests.Sort' | translate }}</button> -->
|
||||
<i class="fa fa-filter"></i> {{ 'Requests.Filter' | translate }}
|
||||
</button>
|
||||
|
||||
|
||||
<button class="btn btn-sm btn-primary-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
|
||||
<i class="fa fa-sort"></i> {{ 'Requests.Sort' | translate }}
|
||||
<span class="caret"></span>
|
||||
</button>
|
||||
<ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
|
||||
<li>
|
||||
<a (click)="setOrder('requestedDate')">{{ 'Requests.SortRequestDate' | translate }}
|
||||
<span *ngIf="order === 'requestedDate'">
|
||||
<span [hidden]="reverse"><small><i class="fa fa-arrow-down" aria-hidden="true"></i></small></span>
|
||||
<span [hidden]="!reverse"><small><i class="fa fa-arrow-up" aria-hidden="true"></i></small></span>
|
||||
</span>
|
||||
</a>
|
||||
<a (click)="setOrder('title')">{{ 'Requests.SortTitle' | translate}}
|
||||
<span *ngIf="order === 'title'">
|
||||
<span [hidden]="reverse"><small><i class="fa fa-arrow-down" aria-hidden="true"></i></small></span>
|
||||
<span [hidden]="!reverse"><small><i class="fa fa-arrow-up" aria-hidden="true"></i></small></span>
|
||||
</span>
|
||||
</a>
|
||||
<a (click)="setOrder('releaseDate')">{{ 'Requests.TheatricalReleaseSort' | translate }}
|
||||
<span *ngIf="order === 'releaseDate'">
|
||||
<span [hidden]="reverse"><small><i class="fa fa-arrow-down" aria-hidden="true"></i></small></span>
|
||||
<span [hidden]="!reverse"><small><i class="fa fa-arrow-up" aria-hidden="true"></i></small></span>
|
||||
</span>
|
||||
</a>
|
||||
<a (click)="setOrder('requestedUser.userAlias')">{{ 'Requests.SortRequestedBy' | translate }}
|
||||
<span *ngIf="order === 'requestedUser.userAlias'">
|
||||
<span [hidden]="reverse"><small><i class="fa fa-arrow-down" aria-hidden="true"></i></small></span>
|
||||
<span [hidden]="!reverse"><small><i class="fa fa-arrow-up" aria-hidden="true"></i></small></span>
|
||||
</span>
|
||||
</a>
|
||||
|
||||
<a (click)="setOrder('status')">{{ 'Requests.SortStatus' | translate }}
|
||||
<span *ngIf="order === 'status'">
|
||||
<span [hidden]="reverse"><small><i class="fa fa-arrow-down" aria-hidden="true"></i></small></span>
|
||||
<span [hidden]="!reverse"><small><i class="fa fa-arrow-up" aria-hidden="true"></i></small></span>
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</span>
|
||||
|
||||
</div>
|
||||
|
|
@ -19,7 +59,7 @@
|
|||
<div infinite-scroll [infiniteScrollDistance]="1" [infiniteScrollThrottle]="100" (scrolled)="loadMore()">
|
||||
|
||||
|
||||
<div *ngFor="let request of movieRequests">
|
||||
<div *ngFor="let request of movieRequests | orderBy: order : reverse : 'case-insensitive'">
|
||||
|
||||
|
||||
<div class="row">
|
||||
|
|
@ -203,8 +243,8 @@
|
|||
</div>
|
||||
<div class="form-group">
|
||||
<div class="radio">
|
||||
<input type="radio" id="approved" name="Status" (click)="filterStatus(filterType.PendingApproval)">
|
||||
<label for="approved">{{ 'Filter.PendingApproval' | translate }}</label>
|
||||
<input type="radio" id="pendingApproval" name="Status" (click)="filterStatus(filterType.PendingApproval, $event)">
|
||||
<label for="pendingApproval">{{ 'Filter.PendingApproval' | translate }}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,8 @@ export class MovieRequestsComponent implements OnInit {
|
|||
public filter: IFilter;
|
||||
public filterType = FilterType;
|
||||
|
||||
public sortDisplay: boolean;
|
||||
public order: string = "requestedDate";
|
||||
public reverse = false;
|
||||
|
||||
private currentlyLoaded: number;
|
||||
private amountToLoad: number;
|
||||
|
|
@ -174,6 +175,14 @@ export class MovieRequestsComponent implements OnInit {
|
|||
});
|
||||
}
|
||||
|
||||
public setOrder(value: string) {
|
||||
if (this.order === value) {
|
||||
this.reverse = !this.reverse;
|
||||
}
|
||||
|
||||
this.order = value;
|
||||
}
|
||||
|
||||
private loadRequests(amountToLoad: number, currentlyLoaded: number) {
|
||||
this.requestService.getMovieRequests(amountToLoad, currentlyLoaded + 1)
|
||||
.subscribe(x => {
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
import { RouterModule, Routes } from "@angular/router";
|
||||
|
||||
import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
|
||||
import { OrderModule } from "ngx-order-pipe";
|
||||
|
||||
import { InfiniteScrollModule } from "ngx-infinite-scroll";
|
||||
|
||||
|
|
@ -34,6 +35,7 @@ const routes: Routes = [
|
|||
TreeTableModule,
|
||||
SharedModule,
|
||||
SidebarModule,
|
||||
OrderModule,
|
||||
],
|
||||
declarations: [
|
||||
RequestComponent,
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
<div class="col-sm-8 small-padding">
|
||||
<div>
|
||||
|
||||
<a href="http://www.imdb.com/title/{{node.data.imdbId}}/" target="_blank">
|
||||
<a *ngIf="node.data.imdbId" href="http://www.imdb.com/title/{{node.data.imdbId}}/" target="_blank">
|
||||
<h4>{{node.data.title}} ({{node.data.firstAired | date: 'yyyy'}})</h4>
|
||||
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -16,44 +16,45 @@
|
|||
</td>
|
||||
</a>
|
||||
</th>
|
||||
<th (click)="setOrder('u.userName')">
|
||||
<th (click)="setOrder('userName')">
|
||||
<a>
|
||||
Username
|
||||
</a>
|
||||
<span *ngIf="order === 'u.userName'">
|
||||
<span *ngIf="order === 'userName'">
|
||||
<span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
|
||||
</span>
|
||||
</th>
|
||||
<th (click)="setOrder('u.alias')">
|
||||
<th (click)="setOrder('alias')">
|
||||
<a>
|
||||
Alias
|
||||
</a>
|
||||
<span *ngIf="order === 'u.alias'">
|
||||
<span *ngIf="order === 'alias'">
|
||||
<span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
|
||||
</span>
|
||||
</th>
|
||||
<th (click)="setOrder('u.emailAddress')">
|
||||
<th (click)="setOrder('emailAddress')">
|
||||
<a>
|
||||
Email
|
||||
</a>
|
||||
<span *ngIf="order === 'u.emailAddress'">
|
||||
<span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
|
||||
<span *ngIf="order === 'emailAddress'">
|
||||
<span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span>
|
||||
<span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
|
||||
</span>
|
||||
</th>
|
||||
<th>
|
||||
Roles
|
||||
</th>
|
||||
<th (click)="setOrder('u.lastLoggedIn')">
|
||||
<th (click)="setOrder('lastLoggedIn')">
|
||||
<a> Last Logged In</a>
|
||||
<span *ngIf="order === 'u.lastLoggedIn'">
|
||||
<span *ngIf="order === 'lastLoggedIn'">
|
||||
<span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
|
||||
</span>
|
||||
</th>
|
||||
<th (click)="setOrder('u.userType')">
|
||||
<th (click)="setOrder('userType')">
|
||||
<a>
|
||||
User Type
|
||||
</a>
|
||||
<span *ngIf="order === 'u.userType'">
|
||||
<span *ngIf="order === 'userType'">
|
||||
<span [hidden]="reverse"><i class="fa fa-arrow-down" aria-hidden="true"></i></span><span [hidden]="!reverse"><i class="fa fa-arrow-up" aria-hidden="true"></i></span>
|
||||
</span>
|
||||
</th>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ export class UserManagementComponent implements OnInit {
|
|||
public emailSettings: IEmailNotificationSettings;
|
||||
public customizationSettings: ICustomizationSettings;
|
||||
|
||||
public order: string = "u.userName";
|
||||
public order: string = "userName";
|
||||
public reverse = false;
|
||||
|
||||
public showBulkEdit = false;
|
||||
|
|
|
|||
6
src/Ombi/package-lock.json
generated
6
src/Ombi/package-lock.json
generated
|
|
@ -4972,9 +4972,9 @@
|
|||
"integrity": "sha512-7lASze8zHSDdAAFO3VNop1TY60rs8A7sm8DzQfU33VNcJI27F6mtxwjILIH339s7m6HVC08AS7I64HBjBMw/QQ=="
|
||||
},
|
||||
"ngx-order-pipe": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/ngx-order-pipe/-/ngx-order-pipe-1.1.1.tgz",
|
||||
"integrity": "sha512-hIfdUONbKG14/S5zEyGjr1ukAd2XdUUnUsvA80ct3pyoBCh5aQ7XhBz7N9jCsVzMGTGUPK6R59KYkEPB3n5hbQ=="
|
||||
"version": "2.0.1",
|
||||
"resolved": "https://registry.npmjs.org/ngx-order-pipe/-/ngx-order-pipe-2.0.1.tgz",
|
||||
"integrity": "sha512-t0IUqoNs3705yZQeohmhUQvpiRTj5RX7AhFXkx3PMfq7G6h7GNNrR3x27XbXEsjKgBo5hPgfEfW5OljRYa1VVw=="
|
||||
},
|
||||
"ngx-window-token": {
|
||||
"version": "0.0.4",
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
"@angular/platform-browser-dynamic": "^5.1.2",
|
||||
"@angular/platform-server": "5.0.0",
|
||||
"@angular/router": "^5.1.2",
|
||||
"@auth0/angular-jwt": "^1.0.0-beta.9",
|
||||
"@auth0/angular-jwt": "1.0.0-beta.9",
|
||||
"@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.8",
|
||||
"@ngx-translate/core": "^8.0.0",
|
||||
"@ngx-translate/http-loader": "^2.0.1",
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
"ng2-cookies": "^1.0.12",
|
||||
"ngx-clipboard": "8.1.1",
|
||||
"ngx-infinite-scroll": "^0.6.1",
|
||||
"ngx-order-pipe": "^1.1.1",
|
||||
"ngx-order-pipe": "^2.0.1",
|
||||
"node-sass": "^4.7.2",
|
||||
"npm": "^5.6.0",
|
||||
"pace-progress": "^1.0.2",
|
||||
|
|
|
|||
2
src/Ombi/typings/globals/globals.d.ts
vendored
2
src/Ombi/typings/globals/globals.d.ts
vendored
|
|
@ -5,6 +5,8 @@ declare var require: any;
|
|||
declare var localStorage: any;
|
||||
declare var introJs: any;
|
||||
|
||||
declare var __webpack_public_path__: any;
|
||||
|
||||
declare module "pace-progress";
|
||||
declare module "webpack-bundle-analyzer";
|
||||
declare module "uglifyjs-webpack-plugin";
|
||||
|
|
@ -117,6 +117,7 @@
|
|||
"RequestStatus": "Request status:",
|
||||
"Denied": " Denied:",
|
||||
"TheatricalRelease": "Theatrical Release: {{date}}",
|
||||
"TheatricalReleaseSort": "Theatrical Release",
|
||||
"DigitalRelease": "Digital Release: {{date}}",
|
||||
"RequestDate": "Request Date:",
|
||||
"QualityOverride": "Quality Override:",
|
||||
|
|
@ -134,7 +135,11 @@
|
|||
"ReportIssue":"Report Issue",
|
||||
"Filter":"Filter",
|
||||
"Sort":"Sort",
|
||||
"SeasonNumberHeading":"Season: {seasonNumber}"
|
||||
"SeasonNumberHeading":"Season: {seasonNumber}",
|
||||
"SortTitle":"Title",
|
||||
"SortRequestDate": "Request Date",
|
||||
"SortRequestedBy":"Requested By",
|
||||
"SortStatus":"Status"
|
||||
},
|
||||
"Issues":{
|
||||
"Title":"Issues",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue