Skip to content

Commit bcb1f02

Browse files
Johaney-sbodnara
authored andcommitted
fix(admin): fix footer
* service access now displays server version in the footer * copyright items are correctly shown
1 parent 9662169 commit bcb1f02

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

libs/perun/components/src/lib/perun-footer/perun-footer.component.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import { Component, OnInit } from '@angular/core';
66
import { MatDialog } from '@angular/material/dialog';
77
import { ReportIssueDialogComponent } from '../report-issue-dialog/report-issue-dialog.component';
8-
import { AuthService, StoreService } from '@perun-web-apps/perun/services';
8+
import { AuthService, InitAuthService, StoreService } from '@perun-web-apps/perun/services';
99
import { getDefaultDialogConfig } from '@perun-web-apps/perun/utils';
1010
import { TranslateService } from '@ngx-translate/core';
1111
import { UtilsService } from '@perun-web-apps/perun/openapi';
@@ -40,7 +40,8 @@ export class PerunFooterComponent implements OnInit {
4040
private translateService: TranslateService,
4141
private utilsService: UtilsService,
4242
private dialog: MatDialog,
43-
private authService: AuthService
43+
private authService: AuthService,
44+
private initAuthService: InitAuthService
4445
) {}
4546

4647
ngOnInit(): void {
@@ -51,7 +52,7 @@ export class PerunFooterComponent implements OnInit {
5152
this.footerColumns = this.storeService.getProperty('footer').columns;
5253

5354
this.guiVersion = require('../../../../../../package.json').version as string;
54-
if (this.authService.isLoggedIn()) {
55+
if (this.authService.isLoggedIn() || this.initAuthService.isServiceAccess()) {
5556
this.utilsService.getPerunStatus().subscribe((val) => {
5657
const versionString = val[0];
5758
this.backendVersion = versionString.substring(versionString.indexOf(':') + 2);
@@ -66,7 +67,7 @@ export class PerunFooterComponent implements OnInit {
6667
this.columnContentHeight = col.elements.length * 25;
6768
}
6869
}
69-
this.copyrightItems = this.storeService.getProperty('footer').copyrightItems;
70+
this.copyrightItems = this.storeService.getProperty('footer').copyright_items;
7071
}
7172

7273
openDialog(name: string): void {

libs/perun/models/src/lib/ConfigProperties.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export interface FooterColumn {
8383

8484
interface Footer {
8585
columns: FooterColumn[];
86-
copyrightItems: CopyrightItem[];
86+
copyright_items: CopyrightItem[];
8787
github_releases?: string;
8888
github_backend_releases?: string;
8989
}

0 commit comments

Comments
 (0)