Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'VM/RED-7521' into 'master'

Browse Source 
RED-7521 - “New file attribute” button, the "Edit file attribute" and "Delete...

Closes RED-7521

See merge request redactmanager/red-ui!96
This commit is contained in:
Dan Percic 2023-09-20 12:17:36 +02:00
commit f9fa0cfd08
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
View File

@ -59,7 +59,7 @@
<iqser-icon-button <iqser-icon-button
(action)="openAddEditAttributeDialog()" (action)="openAddEditAttributeDialog()"
*ngIf="permissionsService.canEditGlobalFileAttributes()" *allow="roles.fileAttributes.writeConfig; if: currentUser.isAdmin"
[attr.help-mode-key]="'create_new_file_attribute'" [attr.help-mode-key]="'create_new_file_attribute'"
[label]="'file-attributes-listing.add-new' | translate" [label]="'file-attributes-listing.add-new' | translate"
[type]="iconButtonTypes.primary" [type]="iconButtonTypes.primary"
@ -105,7 +105,7 @@
</div> </div>
<div class="cell"> <div class="cell">
<div *ngIf="permissionsService.canEditGlobalFileAttributes()" class="action-buttons"> <div *allow="roles.fileAttributes.writeConfig; if: currentUser.isAdmin" class="action-buttons">
<div [attr.help-mode-key]="'edit_delete_file_attribute'"> <div [attr.help-mode-key]="'edit_delete_file_attribute'">
<iqser-circle-button <iqser-circle-button
(action)="openAddEditAttributeDialog(attribute)" (action)="openAddEditAttributeDialog(attribute)"

5
apps/red-ui/src/app/services/permissions.service.ts
View File

@ -40,7 +40,7 @@ export class PermissionsService {
} }
canEditGlobalFileAttributes() { canEditGlobalFileAttributes() {
return this._iqserPermissionsService.has(Roles.fileAttributes.write) && this.isAdmin(); return this._iqserPermissionsService.has(Roles.fileAttributes.writeConfig) && this.isAdmin();
} }
canEditGlobalDossierAttributes() { canEditGlobalDossierAttributes() {
@ -93,7 +93,8 @@ export class PermissionsService {
canEditFileAttributes(file: File, dossier: Dossier): boolean { canEditFileAttributes(file: File, dossier: Dossier): boolean {
return ( return (
dossier.isActive && dossier.isActive &&
(((file.isUnderReview || file.isNew) && this.isDossierMember(dossier)) || (file.isUnderApproval && this.isApprover(dossier))) (((file.isUnderReview || file.isNew) && this.isDossierMember(dossier)) || (file.isUnderApproval && this.isApprover(dossier))) &&
this._iqserPermissionsService.has(Roles.fileAttributes.write)
); );
} }