Merge branch 'develop' of code-repo.d4science.org:MaDgIK/openaire-library into develop
This commit is contained in:
commit
95a3cc3ff6
|
@ -36,7 +36,7 @@ export class HttpInterceptorService implements HttpInterceptor {
|
||||||
} else {
|
} else {
|
||||||
if (isPlatformServer(this.platformId)) {
|
if (isPlatformServer(this.platformId)) {
|
||||||
let headers = new HttpHeaders();
|
let headers = new HttpHeaders();
|
||||||
if(request.withCredentials) {
|
if(request.withCredentials && (properties.dashboard !== 'connect' || properties.environment !== 'production')) {
|
||||||
headers = headers.set('Cookie', this.req.get('Cookie'));
|
headers = headers.set('Cookie', this.req.get('Cookie'));
|
||||||
}
|
}
|
||||||
const authReq = request.clone({
|
const authReq = request.clone({
|
||||||
|
|
|
@ -56,6 +56,7 @@ export class EntitiesSelectionComponent {
|
||||||
showPage["" + data['pages'][i]["route"] + ""] = data['pages'][i]["isEnabled"];
|
showPage["" + data['pages'][i]["route"] + ""] = data['pages'][i]["isEnabled"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
this.entities = [];
|
||||||
if(this.onlyresults) {
|
if(this.onlyresults) {
|
||||||
if(this.simpleView) {
|
if(this.simpleView) {
|
||||||
this.entities.push({label: 'All ' + OpenaireEntities.RESULTS.toLowerCase(), value: 'all'});
|
this.entities.push({label: 'All ' + OpenaireEntities.RESULTS.toLowerCase(), value: 'all'});
|
||||||
|
|
Loading…
Reference in New Issue