permission manager fixes (#778)

This commit is contained in:
Denys Vuika 2018-11-05 09:39:41 +00:00 committed by Suzana Dirla
parent 44a9ade552
commit e33c91ebd4
4 changed files with 34 additions and 19 deletions

View File

@ -1,20 +1,21 @@
<div class="inherit_permission_button"> <div class="inherit_permission_button">
<button mat-raised-button <button
adf-inherit-permission mat-raised-button
[nodeId]="nodeId" adf-inherit-permission
[color]="toggleStatus?'accent':'primary'" [nodeId]="nodeId"
(error)="onError($event)" [color]="toggleStatus ? 'accent' : 'primary'"
(updated)="onUpdatedPermissions($event)"> (error)="onError($event)"
{{ (toggleStatus?'PERMISSIONS.DIALOG.INHERITED_PERMISSIONS_BUTTON':'PERMISSIONS.DIALOG.INHERIT_PERMISSIONS_BUTTON') | translate}}</button> (updated)="onUpdatedPermissions($event)">
<button mat-button (click)="openAddPermissionDialog($event)">Add User or Group</button> {{ (toggleStatus ? 'PERMISSIONS.DIALOG.INHERITED_PERMISSIONS_BUTTON' : 'PERMISSIONS.DIALOG.INHERIT_PERMISSIONS_BUTTON') | translate }}
</div> </button>
<button mat-button (click)="openAddPermissionDialog($event)">
<div> {{ 'PERMISSIONS.DIALOG.ADD_USER_OR_GROUP' | translate }}
<adf-permission-list </button>
#permissionList
[nodeId]="nodeId"
(error)="onError($event)"
(update)="onUpdate($event)">
</adf-permission-list>
</div> </div>
<adf-permission-list
#permissionList
[nodeId]="nodeId"
(error)="onError($event)"
(update)="onUpdate()">
</adf-permission-list>

View File

@ -6,6 +6,19 @@
height: 400px; height: 400px;
} }
// ADF FIXES
adf-permission-list {
.adf-display-permission-container {
flex: 1;
.adf-datatable-permission {
.adf-data-table-cell--icon {
width: auto;
}
}
}
}
.aca-node-permissions-dialog { .aca-node-permissions-dialog {
.mat-dialog-title { .mat-dialog-title {
font-size: 20px; font-size: 20px;

View File

@ -68,7 +68,7 @@ export class PermissionsManagerComponent implements OnInit {
this.store.dispatch(new SnackbarErrorAction(errorMessage)); this.store.dispatch(new SnackbarErrorAction(errorMessage));
} }
onUpdate(event) { onUpdate() {
this.permissionList.reload(); this.permissionList.reload();
} }

View File

@ -263,7 +263,8 @@
"TITLE": "Manage Permissions", "TITLE": "Manage Permissions",
"CLOSE": "Close", "CLOSE": "Close",
"INHERIT_PERMISSIONS_BUTTON": "Inherit Permissions", "INHERIT_PERMISSIONS_BUTTON": "Inherit Permissions",
"INHERITED_PERMISSIONS_BUTTON": "Permissions Inherited" "INHERITED_PERMISSIONS_BUTTON": "Permissions Inherited",
"ADD_USER_OR_GROUP": "Add User or Group"
} }
}, },
"SHARED_LINK": { "SHARED_LINK": {