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

add communityId in claims url when it is provided 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@51304 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2018-03-16 12:28:19 +00:00
parent 4f90bffe50
commit 15ace3ca00
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
claims/claim-utils/displayClaims/displayClaims.component.ts
View File

@ -37,7 +37,6 @@ export class DisplayClaimsComponent {
this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All'; this.fetchBy = (this.types.indexOf(this.fetchBy) != -1)? this.fetchBy:'All';
this.fetchId =(this.fetchId)?this.fetchId: params['fetchId']; this.fetchId =(this.fetchId)?this.fetchId: params['fetchId'];
this.fetchId = this.fetchId?this.fetchId:''; this.fetchId = this.fetchId?this.fetchId:'';
} }
let page = (params['page']=== undefined)?1:+params['page']; let page = (params['page']=== undefined)?1:+params['page'];
@ -102,7 +101,7 @@ export class DisplayClaimsComponent {
@ViewChild(AlertModal) alert; @ViewChild(AlertModal) alert;
claimsDeleted:number = 0; claimsDeleted:number = 0;
@Input() communityId:string = null;
getClaims () { getClaims () {
if(!Session.isValidAndRemove()){ if(!Session.isValidAndRemove()){
this.userValidMessage = "User session has expired. Please login again."; this.userValidMessage = "User session has expired. Please login again.";
@ -222,6 +221,10 @@ handleErrors(err){
} }
params+=(this. getSortby()=='datedesc'?"":(params.length>0?'&':'')+"sort="+this. getSortby()); params+=(this. getSortby()=='datedesc'?"":(params.length>0?'&':'')+"sort="+this. getSortby());
params+=(this.keyword==''?"":(params.length>0?'&':'')+"keyword="+this.keyword); params+=(this.keyword==''?"":(params.length>0?'&':'')+"keyword="+this.keyword);
console.log("AAAA"+this.communityId)
if(this.communityId !=null){
params+="&communityId="+this.communityId;
}
return params; return params;
} }
changeSize(size: number ){ changeSize(size: number ){

7
claims/claimsAdmin/claimsAdmin.component.ts
View File

@ -19,7 +19,8 @@ import { Meta} from '../../sharedComponents/metaService';
</div> </div>
<div> <div>
<div class="uk-text-right"><a routerLink="/participate/claim">Add more Links?</a></div> <div class="uk-text-right"><a routerLink="/participate/claim">Add more Links?</a></div>
<displayClaims [enableDelete]=true [myClaims]=false [isAdmin]=true [fetchBy]= fetchBy [fetchId]=fetchId></displayClaims> <displayClaims [enableDelete]=true [myClaims]=false [isAdmin]=true [fetchBy]= fetchBy [fetchId]=fetchId
[communityId]="(fetchBy && fetchBy == 'Context')?fetchId:null"></displayClaims>
</div> </div>
</div> </div>
</div> </div>
@ -32,8 +33,12 @@ import { Meta} from '../../sharedComponents/metaService';
export class ClaimsAdminComponent { export class ClaimsAdminComponent {
@Input() fetchBy:string; @Input() fetchBy:string;
@Input() fetchId:string; @Input() fetchId:string;
constructor ( private _meta: Meta ) { constructor ( private _meta: Meta ) {
this._meta.setTitle("OpenAIRE | Claims Administrator"); this._meta.setTitle("OpenAIRE | Claims Administrator");
if(this.fetchBy && this.fetchBy == "Context"){
}
} }
ngOnInit() { ngOnInit() {
} }

1
utils/properties/environmentSpecificResolver.ts
View File

@ -10,7 +10,6 @@ export class EnvironmentSpecificResolver implements Resolve<EnvProperties> {
constructor(private envSpecificSvc: EnvironmentSpecificService, private router: Router) {} constructor(private envSpecificSvc: EnvironmentSpecificService, private router: Router) {}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<EnvProperties> { resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<EnvProperties> {
console.log("Here!!!!!!!");
return this.envSpecificSvc.loadEnvironment() return this.envSpecificSvc.loadEnvironment()
.then(es => { .then(es => {
this.envSpecificSvc.setEnvProperties(es); this.envSpecificSvc.setEnvProperties(es);