From d718d365f65d757148814df45b3f3d405b7bbb67 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 14 Nov 2017 15:58:54 +0000 Subject: [PATCH] fix location tooltps for admin users --- .../location-link/location-link.component.ts | 56 ++++++++++--------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/src/app/components/location-link/location-link.component.ts b/src/app/components/location-link/location-link.component.ts index e40baba46..dfbacc866 100644 --- a/src/app/components/location-link/location-link.component.ts +++ b/src/app/components/location-link/location-link.component.ts @@ -104,35 +104,39 @@ export class LocationLinkComponent implements OnInit { const elements = path.elements.map(e => Object.assign({}, e)); if (elements[0].name === 'Company Home') { - if (elements.length === 1) { - elements[0].name = 'Personal Files'; - } else if (elements[1].name === 'Sites') { - const fragment = elements[2]; + elements[0].name = 'Personal Files'; - return new Observable(observer => { - this.apiService.nodesApi.getNodeInfo(fragment.id).then( - (node) => { - elements.splice(0, 2); - elements[0].name = node.properties['cm:title'] || node.name || fragment.name; - elements.splice(1, 1); - elements.unshift({ id: null, name: 'File Libraries' }); + if (elements.length > 1) { + if (elements[1].name === 'Sites') { + const fragment = elements[2]; - observer.next(elements.map(e => e.name).join('/')); - observer.complete(); - }, - (err) => { - elements.splice(0, 2); - elements.unshift({ id: null, name: 'File Libraries' }); - elements.splice(2, 1); + return new Observable(observer => { + this.apiService.nodesApi.getNodeInfo(fragment.id).then( + (node) => { + elements.splice(0, 2); + elements[0].name = node.properties['cm:title'] || node.name || fragment.name; + elements.splice(1, 1); + elements.unshift({ id: null, name: 'File Libraries' }); - observer.next(elements.map(e => e.name).join('/')); - observer.complete(); - } - ); - }); - } else if (elements[1].name === 'User Homes') { - elements.splice(0, 3); - elements.unshift({ id: null, name: 'Personal Files'}); + observer.next(elements.map(e => e.name).join('/')); + observer.complete(); + }, + (err) => { + elements.splice(0, 2); + elements.unshift({ id: null, name: 'File Libraries' }); + elements.splice(2, 1); + + observer.next(elements.map(e => e.name).join('/')); + observer.complete(); + } + ); + }); + } + + if (elements[1].name === 'User Homes') { + elements.splice(0, 3); + elements.unshift({ id: null, name: 'Personal Files'}); + } } }