Skip to content
Snippets Groups Projects
Commit 1a673c90 authored by Florian Azizian's avatar Florian Azizian
Browse files

FIX #14324 TIME 0:15 featureTour + search with empty value

parent a424822a
No related branches found
No related tags found
No related merge requests found
...@@ -67,7 +67,9 @@ class SearchController ...@@ -67,7 +67,9 @@ class SearchController
$searchWhere = $userdataClause['searchWhere']; $searchWhere = $userdataClause['searchWhere'];
$searchData = $userdataClause['searchData']; $searchData = $userdataClause['searchData'];
if (!empty($body['meta']['values'])) {
$body['meta']['values'] = trim($body['meta']['values']);
}
$searchClause = SearchController::getQuickFieldClause(['body' => $body, 'searchWhere' => $searchWhere, 'searchData' => $searchData]); $searchClause = SearchController::getQuickFieldClause(['body' => $body, 'searchWhere' => $searchWhere, 'searchData' => $searchData]);
if (empty($searchClause)) { if (empty($searchClause)) {
return $response->withJson(['resources' => [], 'count' => 0, 'allResources' => []]); return $response->withJson(['resources' => [], 'count' => 0, 'allResources' => []]);
......
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { JoyrideService } from 'ngx-joyride'; import { JoyrideService } from 'ngx-joyride';
import { LocalStorageService } from './local-storage.service';
import { HeaderService } from './header.service'; import { HeaderService } from './header.service';
import { FunctionsService } from './functions.service'; import { FunctionsService } from './functions.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { catchError, tap } from 'rxjs/operators'; import { catchError } from 'rxjs/operators';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { NotificationService } from './notification/notification.service'; import { NotificationService } from './notification/notification.service';
...@@ -97,7 +96,6 @@ export class FeatureTourService { ...@@ -97,7 +96,6 @@ export class FeatureTourService {
constructor( constructor(
public translate: TranslateService, public translate: TranslateService,
private readonly joyrideService: JoyrideService, private readonly joyrideService: JoyrideService,
private localStorage: LocalStorageService,
private headerService: HeaderService, private headerService: HeaderService,
private functionService: FunctionsService, private functionService: FunctionsService,
private router: Router, private router: Router,
...@@ -136,8 +134,9 @@ export class FeatureTourService { ...@@ -136,8 +134,9 @@ export class FeatureTourService {
() => { () => {
if (this.currentTour.redirectToAdmin) { if (this.currentTour.redirectToAdmin) {
this.router.navigate(['/administration']); this.router.navigate(['/administration']);
} else {
this.endTour();
} }
this.endTour();
} }
); );
} }
...@@ -148,7 +147,6 @@ export class FeatureTourService { ...@@ -148,7 +147,6 @@ export class FeatureTourService {
this.featureTourEnd = this.headerService.user.featureTour; this.featureTourEnd = this.headerService.user.featureTour;
} }
const unique = [...new Set(this.tour.map(item => item.type))]; const unique = [...new Set(this.tour.map(item => item.type))];
this.currentStepType = unique.filter(stepType => this.featureTourEnd.indexOf(stepType) === -1)[0]; this.currentStepType = unique.filter(stepType => this.featureTourEnd.indexOf(stepType) === -1)[0];
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment