Merge branch 'markus101'

This commit is contained in:
kay.one 2011-06-20 22:44:30 -07:00
commit 5c45515b00
17 changed files with 236 additions and 181 deletions

View file

@ -32,7 +32,7 @@ namespace NzbDrone.Core.Repository
/// </remarks>
public DateTime? GrabDate { get; set; }
[Ignore]
[ResultColumn]
public EpisodeStatusType Status
{
get

View file

@ -10,32 +10,25 @@ namespace NzbDrone.Core.Repository
{
public virtual int SeriesId { get; set; }
public string Title { get; set; }
public string CleanTitle { get; set; }
public string Status { get; set; }
public string Overview { get; set; }
[DisplayName("Air on")]
public DayOfWeek? AirsDayOfWeek { get; set; }
public String AirTimes { get; set; }
public string Language { get; set; }
public string Path { get; set; }
public bool Monitored { get; set; }
public virtual int QualityProfileId { get; set; }
public bool SeasonFolder { get; set; }
@ -55,5 +48,14 @@ namespace NzbDrone.Core.Repository
[Ignore]
public QualityProfile QualityProfile { get; set; }
[ResultColumn]
public int EpisodeCount { get; set; }
[ResultColumn]
public int EpisodeFileCount { get; set; }
[ResultColumn]
public int SeasonCount { get; set; }
}
}