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

Small changes

Browse source
This commit is contained in:
Jamie.Rees 2017-05-12 16:30:20 +01:00
commit 40fb27ebab
7 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ombi/Ombi.Core/Engine/TvRequestEngine.cs
View file

@ -68,7 +68,7 @@ namespace Ombi.Core.Engine
if (tv.LatestSeason) if (tv.LatestSeason)
{ {
var latest = showInfo.Season.OrderBy(x => x).FirstOrDefault(); var latest = showInfo.Season.OrderBy(x => x.SeasonNumber).FirstOrDefault();
foreach (var modelSeasonRequest in model.SeasonRequests) foreach (var modelSeasonRequest in model.SeasonRequests)
{ {
if (modelSeasonRequest.SeasonNumber == latest.SeasonNumber) if (modelSeasonRequest.SeasonNumber == latest.SeasonNumber)
@ -82,7 +82,7 @@ namespace Ombi.Core.Engine
} }
if (tv.FirstSeason) if (tv.FirstSeason)
{ {
var first = showInfo.Season.OrderByDescending(x => x).FirstOrDefault(); var first = showInfo.Season.OrderByDescending(x => x.SeasonNumber).FirstOrDefault();
foreach (var modelSeasonRequest in model.SeasonRequests) foreach (var modelSeasonRequest in model.SeasonRequests)
{ {
if (modelSeasonRequest.SeasonNumber == first.SeasonNumber) if (modelSeasonRequest.SeasonNumber == first.SeasonNumber)

10
Ombi/Ombi.Store/Context/OmbiContext.cs
View file

@ -17,12 +17,14 @@ namespace Ombi.Store.Context
Database.EnsureCreated(); Database.EnsureCreated();
Database.Migrate(); Database.Migrate();
//#if DEBUG #if DEBUG
// var file = File.ReadAllText(); var location = System.Reflection.Assembly.GetEntryAssembly().Location;
//#else var directory = System.IO.Path.GetDirectoryName(location);
var file = File.ReadAllText(Path.Combine(directory,"SqlTables.sql"));
#else
var file = File.ReadAllText("SqlTables.sql"); var file = File.ReadAllText("SqlTables.sql");
//#endif #endif
// Run Script // Run Script
Database.ExecuteSqlCommand(file, 0); Database.ExecuteSqlCommand(file, 0);

2
Ombi/Ombi/Views/Shared/_Layout.cshtml
View file

@ -1,4 +1,4 @@
@*<!DOCTYPE html>*@ <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />

3
Ombi/Ombi/gulpfile.js
View file

@ -71,7 +71,8 @@ var paths = {
'./bower_components/PACE/themes/orange/pace-theme-flat-top.css', './bower_components/PACE/themes/orange/pace-theme-flat-top.css',
'./bower_components/PACE/themes/orange/pace-theme-loading-bar.css', './bower_components/PACE/themes/orange/pace-theme-loading-bar.css',
'./node_modules/primeng/resources/primeng.css', './node_modules/primeng/resources/primeng.css',
'./node_modules/tether/dist/css/tether.css' './node_modules/tether/dist/css/tether.css',
'./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css',
], ],
dest: './css/lib/' dest: './css/lib/'
}, },

2
Ombi/Ombi/wwwroot/app/interfaces/ISearchTvResult.ts
View file

@ -2,7 +2,7 @@
export interface ISearchTvResult { export interface ISearchTvResult {
id: number, id: number,
seriesName: string, title: string,
aliases: string[], aliases: string[],
banner: string, banner: string,
seriesId: number, seriesId: number,

2
Ombi/Ombi/wwwroot/app/requests/tvrequests.component.html
View file

@ -78,7 +78,7 @@
<!--Child Requests--> <!--Child Requests-->
<div *ngIf="request.hasChildRequests"> <div *ngIf="request.hasChildRequests">
<button type="button" class="btn btn-info" data-toggle="collapse" [attr.data-target]="'#' + request.id +'childRequests'">Children</button> <button type="button" class="btn btn-sm btn-info-outline" data-toggle="collapse" [attr.data-target]="'#' + request.id +'childRequests'">Children</button>
<div id="{{request.id}}childRequests" class="collapse"> <div id="{{request.id}}childRequests" class="collapse">
<div *ngFor="let child of request.childRequests"> <div *ngFor="let child of request.childRequests">

2
Ombi/Ombi/wwwroot/app/search/tvsearch.component.ts
View file

@ -107,7 +107,7 @@ export class TvSearchComponent implements OnInit, OnDestroy {
if (this.result.requestAdded) { if (this.result.requestAdded) {
this.notificationService.success("Request Added", this.notificationService.success("Request Added",
`Request for ${searchResult.seriesName} has been added successfully`); `Request for ${searchResult.title} has been added successfully`);
} else { } else {
this.notificationService.warning("Request Added", this.result.message); this.notificationService.warning("Request Added", this.result.message);
} }