Project

General

Profile

« Previous | Next » 

Revision 59452

[use-UoaAdminToolsLibrary | Library]: Merge trunk into branch.

View differences:

project.component.ts
161 161
        }
162 162
        //this.getDivContents();
163 163
        this.getPageContents();
164
        this.updateUrl(data.envSpecific.baseLink + this._router.url);
164
        this.updateUrl(this.properties.domain + this.properties.baseLink + this._router.url);
165 165

  
166 166
      });
167 167
    this.sub = this.route.queryParams.subscribe(params => {
......
356 356
        if(err.status == 404) {
357 357
          this._router.navigate(['/error'], {queryParams: {"page": this._location.path(true), "page_type": "project"}});
358 358
        }
359
        this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this.properties.searchLinkToProjects);
359
        this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink + this.properties.searchLinkToProjects);
360 360
        this.errorMessage = 'No project found';
361 361
        this.showLoading = false;
362 362
      }
......
385 385
        if(err.status == 404) {
386 386
          this._router.navigate(['/error'], {queryParams: {"page": this._location.path(true), "page_type": "project"}});
387 387
        }
388
        this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this.properties.searchLinkToProjects);
388
        this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink + this.properties.searchLinkToProjects);
389 389
        this.errorMessage = 'No project found';
390 390
        this.showLoading = false;
391 391
      }
......
397 397
    if (this.projectName == undefined || this.projectName == '') {
398 398
      this.projectName = this.projectInfo.title;
399 399
    }
400
    this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this._router.url);
400
    this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink + this._router.url);
401 401
    this.updateTitle(this.projectName);
402 402
    this.updateDescription(this.projectInfo.description?this.projectInfo.description: ("project" + (this.projectInfo.title?"," + this.projectInfo.title:"") + (this.projectInfo.funding && this.projectInfo.funding.funderName?", funder: " + this.projectInfo.funding.funderName:"") + (this.projectInfo.acronym?"," + this.projectInfo.acronym:"")));
403 403
    if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {

Also available in: Unified diff