Minor fixes

This commit is contained in:
Adina Țeudan 2021-11-19 20:44:02 +02:00
parent 0dc8876df0
commit b2bea5dd70
4 changed files with 10 additions and 9 deletions

View File

@ -35,6 +35,7 @@ const routes: Routes = [
component: BaseScreenComponent,
loadChildren: () => import('./modules/dossier/dossiers.module').then(m => m.DossiersModule),
canActivate: [CompositeRouteGuard],
canDeactivate: [DossiersGuard],
data: {
routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard, DossiersGuard],
requiredRoles: ['RED_USER', 'RED_MANAGER'],

View File

@ -1,8 +1,8 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, CanDeactivate, Router, RouterStateSnapshot } from '@angular/router';
import { DossiersService } from '../services/entity-services/dossiers.service';
import { BreadcrumbsService } from '../services/breadcrumbs.service';
import { AppStateService } from '../state/app-state.service';
import { DossiersService } from '@services/entity-services/dossiers.service';
import { BreadcrumbsService } from '@services/breadcrumbs.service';
import { AppStateService } from '@state/app-state.service';
@Injectable({ providedIn: 'root' })
export class DossiersGuard implements CanActivate, CanDeactivate<unknown> {

View File

@ -20,7 +20,7 @@ export class AccountSideNavComponent {
},
{
screen: 'notifications',
label: _('notifications.title'),
label: _('notifications'),
},
];
}

View File

@ -985,10 +985,6 @@
"total-rows": "{rows} rows in total"
},
"file-attributes-listing": {
"error": {
"generic": "Failed to add File-Attribute",
"conflict": "File-Attribute with this name already exists!"
},
"action": {
"delete": "Delete Attribute",
"edit": "Edit Attribute"
@ -997,6 +993,10 @@
"bulk-actions": {
"delete": "Delete Selected Attributes"
},
"error": {
"conflict": "File-Attribute with this name already exists!",
"generic": "Failed to add File-Attribute"
},
"no-data": {
"title": "There are no file attributes yet."
},
@ -1280,7 +1280,6 @@
"sep": "Sep."
},
"notification": {
"no-data": "You currently have no notifications",
"assign-approver": "You have been assigned as approver for <b><a href=\"{fileHref}\" target=\"_blank\">{fileName}</a></b> in the <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a><b>!",
"assign-reviewer": "You have been assigned as reviewer for <b><a href=\"{fileHref}\" target=\"_blank\">{fileName}</a></b> in the <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a><b>!",
"document-approved": " <b><a href=\"{fileHref}\" target=\"_blank\">{fileName}</a></b> has been approved!",
@ -1288,6 +1287,7 @@
"dossier-owner-deleted": "<b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a></b> owner removed!",
"dossier-owner-removed": "<b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a></b> owner removed!",
"dossier-owner-set": " <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a></b> owner changed to <b>{user}</b>!",
"no-data": "You currently have no notifications",
"unassigned-from-file": "You have been unassigned from <b><a href=\"{fileHref}\" target=\"_blank\">{fileName}</a></b> in the <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a><b>!",
"user-becomes-dossier-member": "<b>{user}</b> joined dossier: <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a></b>!",
"user-demoted-to-reviewer": "<b>{user}</b> demoted to reviewer in dossier: <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a></b>!",