inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-4124] Display authorityName when authorityDisplayName is missing (#6371)

Browse Source
This commit is contained in:
davidcanonieto
2020-11-23 01:09:00 +00:00
committed by GitHub
parent 49368c746f
commit 46fd14becf
1 changed files with 64 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.html
View File

@@ -1,4 +1,5 @@
<mat-form-field floatPlaceholder="never" class="adf-permission-search-input"> <mat-form-field floatPlaceholder="never"
class="adf-permission-search-input">
<input matInput <input matInput
id="searchInput" id="searchInput"
[formControl]="searchInput" [formControl]="searchInput"
@@ -10,7 +11,8 @@
class="adf-permission-search-icon" class="adf-permission-search-icon"
data-automation-id="adf-permission-clear-input" data-automation-id="adf-permission-clear-input"
id="adf-permission-clear-input" id="adf-permission-clear-input"
matSuffix (click)="clearSearch()">clear matSuffix
(click)="clearSearch()">clear
</mat-icon> </mat-icon>
<mat-icon *ngIf="searchedWord?.length === 0" <mat-icon *ngIf="searchedWord?.length === 0"
@@ -20,21 +22,23 @@
</mat-icon> </mat-icon>
</mat-form-field> </mat-form-field>
<div *ngIf="searchedWord?.length === 0" id="adf-add-permission-type-search"> <div *ngIf="searchedWord?.length === 0"
id="adf-add-permission-type-search">
<span class="adf-permission-start-message">{{'PERMISSION_MANAGER.ADD-PERMISSION.TYPE-MESSAGE' | translate}}</span> <span class="adf-permission-start-message">{{'PERMISSION_MANAGER.ADD-PERMISSION.TYPE-MESSAGE' | translate}}</span>
</div> </div>
<adf-search #search [searchTerm]="searchedWord" <adf-search #search
[searchTerm]="searchedWord"
id="adf-add-permission-authority-results" id="adf-add-permission-authority-results"
class="adf-permission-result-list" class="adf-permission-result-list"
[class.adf-permission-result-list-search]="searchedWord.length === 0"> [class.adf-permission-result-list-search]="searchedWord.length === 0">
<ng-template let-data> <ng-template let-data>
<mat-selection-list class="adf-permission-result-list-elements"> <mat-selection-list class="adf-permission-result-list-elements">
<mat-list-option <mat-list-option id="adf-add-permission-group-everyone"
id="adf-add-permission-group-everyone"
class="adf-list-option-item" class="adf-list-option-item"
(click)="elementClicked(EVERYONE)"> (click)="elementClicked(EVERYONE)">
<mat-icon mat-list-icon id="add-group-icon"> <mat-icon mat-list-icon
id="add-group-icon">
group_add group_add
</mat-icon> </mat-icon>
<p> <p>
@@ -46,17 +50,28 @@
(click)="elementClicked(item)" (click)="elementClicked(item)"
class="adf-list-option-item" class="adf-list-option-item"
id="result_option_{{idx}}"> id="result_option_{{idx}}">
<mat-icon mat-list-icon id="add-group-icon" <mat-icon mat-list-icon
id="add-group-icon"
*ngIf="item?.entry?.nodeType === 'cm:authorityContainer' else show_person_icon"> *ngIf="item?.entry?.nodeType === 'cm:authorityContainer' else show_person_icon">
group_add group_add
</mat-icon> </mat-icon>
<ng-template #show_person_icon> <ng-template #show_person_icon>
<mat-icon id="add-person-icon" mat-list-icon>person_add</mat-icon> <mat-icon id="add-person-icon"
mat-list-icon>person_add</mat-icon>
</ng-template> </ng-template>
<p> <p>
{{item.entry?.properties['cm:authorityDisplayName']? <ng-container *ngIf="item.entry?.properties['cm:authorityDisplayName']; else authorityName">
item.entry?.properties['cm:authorityDisplayName'] : {{item.entry?.properties['cm:authorityDisplayName']}}
item.entry?.properties['cm:owner']?.displayName}}</p> </ng-container>
<ng-template #authorityName>
<ng-container *ngIf="item.entry?.properties['cm:authorityName']; else owner">
{{item.entry?.properties['cm:authorityName']}}
</ng-container>
</ng-template>
<ng-template #owner>
{{item.entry?.properties['cm:owner']?.displayName}}
</ng-template>
</p>
</mat-list-option> </mat-list-option>
</mat-selection-list> </mat-selection-list>
</ng-template> </ng-template>