Skip to content
Snippets Groups Projects

Fixed errors with loading a PA after a PUA.

Merged naji requested to merge fix/switchingprofile into feat/test
7 unresolved threads

Fixed label of breadcrumb.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
15 15 >
16 16
17 17 <!--Root node name-->
18 18 <span *ngIf="node.name === rootElementName && !puaMode" class="pastis-tree-node-root-name">
  • naji
    naji @naji started a thread on the diff
  • 64 64
    65 65 </mat-list-item>
    66 66
    67
    68
  • 31 31
    32 32 public class ProfileResponse {
    33 33 Long id;
    34 String name;
    34 35 ElementProperties profile;
    35 36 Notice notice;
    36 37 String type;
    37 38
    39 public String getName() {
    40 return name;
    41 }
    42
    43 public void setName(String name) {
  • naji
    naji @naji started a thread on the diff
  • 124 125 ngOnInit() {
    125 126 this.languagePopup = false;
    126 127 this.docPath = 'assets/doc/VITAM UI - Documentation APP - PASTIS.pdf';
    127 this.profileModeLabel = this.profileService.profileMode==='PUA'?'Profil d\'Unité Archivistique':'Profil d\'Archivage';
    128 this.breadcrumbDataTop = [{ label: 'Portail', url: this.startupService.getPortalUrl(), external: true},{ label: 'Créer et gérer un profil d\'archivage', url: '/'}, { label: this.profileModeLabel }];
    128 this.profileModeLabel = this.profileService.profileMode==='PUA'?"PROFILE.EDIT_PROFILE.BREADCRUMB.PUA":"PROFILE.EDIT_PROFILE.BREADCRUMB.PA";
    129 this.breadcrumbDataTop = [{ label: "PROFILE.EDIT_PROFILE.BREADCRUMB.PORTAIL", url: this.startupService.getPortalUrl(), external: true},{ label: "PROFILE.EDIT_PROFILE.BREADCRUMB.CREER_ET_GERER_PROFIL", url: '/'}, { label: this.profileModeLabel }];
  • naji
    naji @naji started a thread on the diff
  • 308 291 return this.profileService.profileMode === "PUA" ? (tabIndex === 0 || tabIndex === 3 || tabIndex === 5) : true;
    309 292 }
    310 293
    311 getProfileName(profileId: number): string{
    312 if(profileId == undefined) {
    313 return null
    314 };
    315 if(this.profileList != undefined){
    316 let profiles: ProfileDescription[] = this.profileList.filter(profile => profile.id == profileId);
    317 this.profileName = profiles[0].baseName;
    318 if(this.profileName != undefined){
    319 return profiles[0].baseName;
    320 }
  • 48 48 import { BreadcrumbDataTop } from '../profile/edit-profile/classes/breadcrumb';
    49 49 import { StartupService } from 'ui-frontend-common';
    50 50 import { environment } from '../../environments/environment';
    51 import { TranslateService } from '@ngx-translate/core';
  • couzinie added 1 commit

    added 1 commit

    • 8413e095 - Fix profilename missing from some profileService functions

    Compare with previous version

  • 52 52 import {DuplicateMetadataComponent} from "../../../user-actions/duplicate-metadata/duplicate-metadata.component";
    53 53 import {LangChangeEvent, TranslateService} from "@ngx-translate/core";
    54 54 import {environment} from "../../../../environments/environment";
    55 import { ProfileService } from 'projects/identity/src/app/profile/profile.service';
  • naji added 1 commit

    added 1 commit

    • b41472ac - fix:bad import profileService

    Compare with previous version

  • naji added 1 commit

    added 1 commit

    • 3ea17089 - fix:bad import profileService

    Compare with previous version

  • naji mentioned in commit fcc337a5

    mentioned in commit fcc337a5

  • merged

  • Please register or sign in to reply