Project

General

Profile

« Previous | Next » 

Revision 46792

fix dropdown change in orcid tab of claim| add free guard in every route with no authentication required | add '*' route in server in order to show erro page not json-no contnet| Claims: get user mail from Session -jwt,tidy up display claims component (myclaims, claims)| remove folder src/app/home | LOgin: change login method to post, redirect after login/logout using queryparams of the current page, add Session helper class

View differences:

insertClaim.component.ts
5 5
import {ModalLoading} from '../../../utils/modal/loading.component';
6 6
import {AlertModal} from '../../../utils/modal/alert';
7 7
import {Md5} from 'ts-md5/dist/md5';
8

  
8
import {Session} from '../../../login/utils/helper.class';
9 9
@Component({
10 10
    selector: 'claim-insert',
11 11
    template: `
......
19 19
    <modal-loading [message]= "'Please wait...'"></modal-loading>
20 20
    <modal-alert (alertOutput)="confirmClose($event)">
21 21
    </modal-alert>
22
    <button  *ngIf="claiming == false && showButton == true" (click)="validateInsertions()"  class="uk-button uk-button-primary uk-align-right"  >Finish</button>
22
    <button  *ngIf="!claiming  && showButton" (click)="validateInsertions()"  class="uk-button uk-button-primary uk-align-right"  >Finish</button>
23 23
    `
24 24
})
25 25
export class ClaimInsertComponent {
......
60 60
}
61 61
private insert(){
62 62
  this.claiming = true;
63
  var user="argirok@di.uoa.gr"
63
  var user=Session.getUserEmail();
64
  var jwt=Session.getUserJwt();
64 65
  this.loading.open();
65 66
  var claims = [];
66 67
  var directclaims = [];
......
161 162
}
162 163
private afterclaimsInsertion(insertedIds, errorInClaims){
163 164
  this.loading.close();
165
  this.claiming = false;
164 166
  if(errorInClaims.length == 0 && insertedIds.length > 0 ){
165 167
    // if(this.inline){
166 168
    //   this.show = "end";
......
178 180
  this.errorMessage = "An Error Occured.";
179 181
  this.loading.close();
180 182
  this.error =  true;
183
  this.claiming = false;
184
  this.showButton = true;
181 185
  //   if(this.inline){
182 186
  //     this.show = "error";
183 187
  //     this.showChange.emit({

Also available in: Unified diff