github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-23 14:35:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into localization-2

Browse source
This commit is contained in:
Florian Dupret 2021-10-28 08:50:00 +02:00
commit e6d2a172a5
4 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
CHANGELOG.md
View file

@ -1,3 +1,12 @@
## [4.3.1](https://github.com/Ombi-app/Ombi/compare/v4.3.0...v4.3.1) (2021-10-27)
### Bug Fixes
* :bug: Hides no results message during search. ([#4375](https://github.com/Ombi-app/Ombi/issues/4375)) ([b819b0e](https://github.com/Ombi-app/Ombi/commit/b819b0e007e578bf3d8425f19591f87029c64d06))
# [4.3.0](https://github.com/Ombi-app/Ombi/compare/v4.2.13...v4.3.0) (2021-10-20) # [4.3.0](https://github.com/Ombi-app/Ombi/compare/v4.2.13...v4.3.0) (2021-10-20)
@ -53,12 +62,3 @@
## [4.2.10](https://github.com/Ombi-app/Ombi/compare/v4.2.9...v4.2.10) (2021-10-15)
### Bug Fixes
* :bug: Really really fix it this time? ([543d36e](https://github.com/Ombi-app/Ombi/commit/543d36e5615341bc8378cac377b843a3dbc1ef99))

5
src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.html
View file

@ -1,14 +1,13 @@
<div class="small-middle-container" > <div class="small-middle-container" >
<div *ngIf="loadingFlag" class="row justify-content-md-center top-spacing loading-spinner"> <div *ngIf="loadingFlag" class="row justify-content-md-center top-spacing loading-spinner">
<mat-spinner [color]="'accent'"></mat-spinner> <mat-spinner [color]="'accent'"></mat-spinner>
</div> </div>
<div *ngIf="discoverResults && discoverResults.length > 0" class="row full-height discoverResults col" > <div *ngIf="discoverResults.length > 0" class="row full-height discoverResults col" >
<div id="searchResults" class="col-xl-2 col-lg-3 col-md-3 col-6 col-sm-4 small-padding" *ngFor="let result of discoverResults" data-test="searchResultsCount" attr.search-count="{{discoverResults.length}}"> <div id="searchResults" class="col-xl-2 col-lg-3 col-md-3 col-6 col-sm-4 small-padding" *ngFor="let result of discoverResults" data-test="searchResultsCount" attr.search-count="{{discoverResults.length}}">
<discover-card [isAdmin]="isAdmin" [result]="result"></discover-card> <discover-card [isAdmin]="isAdmin" [result]="result"></discover-card>
</div> </div>
</div> </div>
<div *ngIf="!discoverResults || discoverResults.length === 0"> <div *ngIf="!loadingFlag && discoverResults.length === 0">
<div class="row justify-content-md-center top-spacing loading-spinner"> <div class="row justify-content-md-center top-spacing loading-spinner">
<h1 id="noSearchResult"> {{'Discovery.NoSearch' | translate}} <i class="far fa-frown" aria-hidden="true"></i></h1> <h1 id="noSearchResult"> {{'Discovery.NoSearch' | translate}} <i class="far fa-frown" aria-hidden="true"></i></h1>
</div> </div>

7
src/Ombi/ClientApp/src/app/discover/components/search-results/search-results.component.ts
View file

@ -50,7 +50,6 @@ export class DiscoverSearchResultsComponent implements OnInit {
this.clear(); this.clear();
this.loadAdvancedData(); this.loadAdvancedData();
}); });
} }
public async ngOnInit() { public async ngOnInit() {
@ -79,8 +78,7 @@ export class DiscoverSearchResultsComponent implements OnInit {
await this.search(); await this.search();
} }
public createInitalModel() { private createInitialModel() {
this.finishLoading();
this.results.forEach(m => { this.results.forEach(m => {
let mediaType = RequestType.movie; let mediaType = RequestType.movie;
@ -119,6 +117,7 @@ export class DiscoverSearchResultsComponent implements OnInit {
tvMovieDb: mediaType === RequestType.tvShow ? true : false tvMovieDb: mediaType === RequestType.tvShow ? true : false
}); });
}); });
this.finishLoading();
} }
private loading() { private loading() {
@ -180,6 +179,6 @@ export class DiscoverSearchResultsComponent implements OnInit {
this.clear(); this.clear();
this.results = await this.searchService this.results = await this.searchService
.multiSearch(this.searchTerm, this.filter).toPromise(); .multiSearch(this.searchTerm, this.filter).toPromise();
this.createInitalModel(); this.createInitialModel();
} }
} }

2
version.json
View file

@ -1,3 +1,3 @@
{ {
"version": "4.3.0" "version": "4.3.1"
} }