Project

General

Profile

« Previous | Next » 

Revision 56014

[Trunk|Admin]: Curators edit personal info: On add affiliation transform logoUrl to tinyUrl.

View differences:

modules/uoa-admin-portal/trunk/src/app/pages/curator/curator.component.ts
9 9
import {Affiliation, Curator} from '../../openaireLibrary/utils/entities/CuratorInfo';
10 10
import {HelperFunctions} from '../../openaireLibrary/utils/HelperFunctions.class';
11 11
import {AlertModal} from '../../openaireLibrary/utils/modal/alert';
12
import {CuratorPhotoService} from '../../openaireLibrary/services/curatorPhoto.service';
12
import {UtilitiesService} from '../../openaireLibrary/services/utilities.service';
13 13

  
14 14
@Component({
15 15
  selector: 'curator',
......
40 40
              private route: ActivatedRoute,
41 41
              private _router: Router,
42 42
              private curatorService: CuratorService,
43
              private curatorPhotoService: CuratorPhotoService) {
43
              private utilitiesService: UtilitiesService) {
44 44
  }
45 45

  
46 46

  
......
223 223
      if (this.hasChanged && this.curator && this.curator.name && this.curator.name !== '') {
224 224
        this.showLoading = true;
225 225
        if (this.file) {
226
          this.curatorPhotoService.uploadPhoto(this.properties.uploadService + '/' + this.curator._id, this.file).subscribe((res) => {
226
          this.utilitiesService.uploadPhoto(this.properties.uploadService + '/' + this.curator._id, this.file).subscribe((res) => {
227 227
              if (this.curator.photo && this.curator.photo !== '') {
228
                this.curatorPhotoService.deletePhoto(this.properties.deleteUrl + '/' + this.curator.photo).subscribe();
228
                this.utilitiesService.deletePhoto(this.properties.deleteUrl + '/' + this.curator.photo).subscribe();
229 229
              }
230 230
              this.curator.photo = res.filename;
231 231
              this.curatorService.updateCurator(this.properties.adminToolsAPIURL + 'curator',
......
268 268

  
269 269
  addAffiliation() {
270 270
    if (!this.isEmptyAffiliation()) {
271
      if (this.index === -1) {
272
        this.curator.affiliations.push(this.affiliation);
271
      if(!HelperFunctions.isTiny(this.affiliation.logo_url)) {
272
        this.utilitiesService.getTiny(this.properties.tinyUrl + this.affiliation.logo_url).subscribe((res)=> {
273
          this.affiliation.logo_url = res;
274
          if (this.index === -1) {
275
            this.curator.affiliations.push(this.affiliation);
276
          } else {
277
            this.curator.affiliations[this.index] = this.affiliation;
278
          }
279
          this.change();
280
        })
273 281
      } else {
274
        this.curator.affiliations[this.index] = this.affiliation;
282
        if (this.index === -1) {
283
          this.curator.affiliations.push(this.affiliation);
284
        } else {
285
          this.curator.affiliations[this.index] = this.affiliation;
286
        }
287
        this.change();
275 288
      }
276
      this.change();
277 289
    }
278 290
  }
279 291

  
modules/uoa-admin-portal/trunk/src/app/pages/curator/curator.module.ts
10 10
import {ConnectAdminLoginGuard} from '../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard';
11 11
import {CuratorService} from '../../openaireLibrary/connect/curators/curator.service';
12 12
import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module';
13
import {CuratorPhotoService} from '../../openaireLibrary/services/curatorPhoto.service';
13
import {UtilitiesService} from '../../openaireLibrary/services/utilities.service';
14 14

  
15 15
@NgModule({
16 16
  imports: [
......
21 21
    CuratorComponent
22 22
  ],
23 23
  providers: [
24
    CuratorService, CuratorPhotoService, IsCommunity, ConnectAdminLoginGuard
24
    CuratorService, UtilitiesService, IsCommunity, ConnectAdminLoginGuard
25 25
  ],
26 26
  exports: [
27 27
    CuratorComponent
modules/uoa-admin-portal/trunk/src/assets/env-properties.json
32 32
  "uploadService" : "http://mpagasas.di.uoa.gr:8000/upload",
33 33
  "downloadUrl" : "http://mpagasas.di.uoa.gr:8000/download",
34 34
  "deleteUrl" : "http://mpagasas.di.uoa.gr:8000/delete",
35
  "tinyUrl": "http://mpagasas.uoa.gr:8000/tiny?url=",
35
  "tinyUrl": "http://mpagasas.di.uoa.gr:8000/tiny?url=",
36 36

  
37 37
  "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
38 38

  

Also available in: Unified diff