nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-777 Set default rest url to window.host

This commit is contained in:
Miguel Martin Rojas 2019-01-30 13:06:40 +01:00 committed by holgerhagen
parent 099bf2df74
commit 41a6b4d0e2
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest/taskana-rest-spring-example/src/main/resources/static/environments/data-sources/environment-information.json
View File

@ -1,3 +1,3 @@
{ {
"taskanaRestUrl": "https://taskana.mybluemix.net" "taskanaRestUrl": ""
} }

10
web/src/app/services/startup-service/startup.service.ts
View File

@ -3,7 +3,6 @@ import { HttpClient } from '@angular/common/http';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { environment } from 'app/../environments/environment'; import { environment } from 'app/../environments/environment';
import { Injectable, Injector } from '@angular/core'; import { Injectable, Injector } from '@angular/core';
import { TitlesService } from 'app/services/titles/titles.service';
import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service'; import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service';
import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
@ -11,11 +10,8 @@ import { WindowRefService } from 'app/services/window/window.service';
@Injectable() @Injectable()
export class StartupService { export class StartupService {
constructor( constructor(
private httpClient: HttpClient, private httpClient: HttpClient,
private titlesService: TitlesService,
private customFieldsService: CustomFieldsService, private customFieldsService: CustomFieldsService,
private taskanaEngineService: TaskanaEngineService, private taskanaEngineService: TaskanaEngineService,
private injector: Injector, private injector: Injector,
@ -36,10 +32,10 @@ export class StartupService {
} }
getEnvironmentFilePromise() { getEnvironmentFilePromise() {
return this.httpClient.get<any>('environments/data-sources/environment-information.json').pipe(map(jsonFile => { return this.httpClient.get<any>('/environments/data-sources/environment-information.json').pipe(map(jsonFile => {
if (jsonFile) { if (jsonFile && environment.taskanaRestUrl === '') {
environment.taskanaRestUrl = jsonFile.taskanaRestUrl === '' ? environment.taskanaRestUrl = jsonFile.taskanaRestUrl === '' ?
environment.taskanaRestUrl : jsonFile.taskanaRestUrl; window.location.protocol + '//' + window.location.host : jsonFile.taskanaRestUrl;
this.customFieldsService.initCustomFields('EN', jsonFile); this.customFieldsService.initCustomFields('EN', jsonFile);
} }
})).toPromise() })).toPromise()