MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing menu that gets invisible| add id in user session| add miningBackendURL in properties class 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51506 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2018-03-26 08:54:29 +00:00
parent 22aba716dd
commit 2248346582
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
login/userMini.component.ts
View File

@ -31,8 +31,8 @@ import{EnvProperties} from '../utils/properties/env-properties';
<li *ngIf="isAuthorized"><a routerLinkActive="uk-link" routerLink="/claims">Manage all Claims</a></li--> <li *ngIf="isAuthorized"><a routerLinkActive="uk-link" routerLink="/claims">Manage all Claims</a></li-->
<ng-container *ngFor="let item of userMenuItems "> <ng-container *ngFor="let item of userMenuItems ">
<li *ngIf="item.needsAuthorization && isAuthorized || !item.needsAuthorization"> <li *ngIf="item.needsAuthorization && isAuthorized || !item.needsAuthorization">
<a *ngIf="item.route.length > 0" routerLinkActive="uk-link" routerLink="{{item.route}}" [queryParams]=item.params >{{item.title}}</a> <a *ngIf="item.route.length > 0" routerLink="{{item.route}}" [queryParams]=item.params >{{item.title}}</a>
<a *ngIf="item.route.length == 0 && item.url.length > 0" routerLinkActive="uk-link" href="{{item.url}}" >{{item.title}}</a> <a *ngIf="item.route.length == 0 && item.url.length > 0" href="{{item.url}}" >{{item.title}}</a>
</li> </li>
</ng-container> </ng-container>
<li><a (click)="logOut()" id="logout" >Log out</a></li> <li><a (click)="logOut()" id="logout" >Log out</a></li>
@ -59,8 +59,8 @@ import{EnvProperties} from '../utils/properties/env-properties';
<li *ngIf="isAuthorized"><a routerLinkActive="uk-link" routerLink="/claims">Manage all Claims</a></li--> <li *ngIf="isAuthorized"><a routerLinkActive="uk-link" routerLink="/claims">Manage all Claims</a></li-->
<ng-container *ngFor="let item of userMenuItems "> <ng-container *ngFor="let item of userMenuItems ">
<li *ngIf="item.needsAuthorization && isAuthorized || !item.needsAuthorization"> <li *ngIf="item.needsAuthorization && isAuthorized || !item.needsAuthorization">
<a *ngIf="item.route.length > 0" routerLinkActive="uk-link" routerLink="{{item.route}}" >{{item.title}}</a> <a *ngIf="item.route.length > 0" routerLink="{{item.route}}" >{{item.title}}</a>
<a *ngIf="item.route.length == 0 && item.url.length > 0"routerLinkActive="uk-link" href="{{item.url}}" >{{item.title}}</a> <a *ngIf="item.route.length == 0 && item.url.length > 0" href="{{item.url}}" >{{item.title}}</a>
</li> </li>
</ng-container> </ng-container>
<li><a (click)="logOut()" id="logout" >Log out</a></li> <li><a (click)="logOut()" id="logout" >Log out</a></li>

1
login/utils/helper.class.ts
View File

@ -218,6 +218,7 @@ export class MyJWT{
return null; return null;
} }
var user: User = new User(); var user: User = new User();
user.id = (info.sub && info.sub.indexOf('@'))?info.sub.substring(0,info.sub.indexOf('@')):info.sub;
user.firstname = (StringUtils.URIDecode((info.firstname && info.firstname!="")?info.firstname:"")).replace("+"," "); user.firstname = (StringUtils.URIDecode((info.firstname && info.firstname!="")?info.firstname:"")).replace("+"," ");
user.lastname = (StringUtils.URIDecode((info.lastname && info.lastname!="")?info.lastname:"")).replace("+"," "); user.lastname = (StringUtils.URIDecode((info.lastname && info.lastname!="")?info.lastname:"")).replace("+"," ");

1
utils/properties/env-properties.ts
View File

@ -83,6 +83,7 @@ export class EnvProperties {
communityAPI; communityAPI;
communitiesAPI; communitiesAPI;
miningBackendURL;
csvLimit: number; csvLimit: number;
pagingLimit: number; pagingLimit: number;