Compare commits

...

3 Commits

Author SHA1 Message Date
Dan Percic
78d0cedd30 RED-8554 remove 80 port 2024-02-16 13:59:53 +02:00
Dan Percic
590e8da0bc show dossier dictionaries even if dossier redaction is not available 2024-02-16 10:36:06 +02:00
Christoph Schabert
489dde97d5 Update file Dockerfile 2024-02-14 13:24:44 +01:00
3 changed files with 5 additions and 7 deletions

View File

@ -13,7 +13,6 @@ import {
WorkflowFileStatus, WorkflowFileStatus,
WorkflowFileStatuses, WorkflowFileStatuses,
} from '@red/domain'; } from '@red/domain';
import { DossierDictionariesMapService } from '@services/entity-services/dossier-dictionaries-map.service';
import { FeaturesService } from '@services/features.service'; import { FeaturesService } from '@services/features.service';
import { FilesMapService } from '@services/files/files-map.service'; import { FilesMapService } from '@services/files/files-map.service';
import { Roles } from '@users/roles'; import { Roles } from '@users/roles';
@ -30,7 +29,6 @@ export class PermissionsService {
private readonly _featuresService: FeaturesService, private readonly _featuresService: FeaturesService,
private readonly _userPreferenceService: UserPreferenceService, private readonly _userPreferenceService: UserPreferenceService,
private readonly _iqserPermissionsService: IqserPermissionsService, private readonly _iqserPermissionsService: IqserPermissionsService,
private readonly _dossierDictionariesMapService: DossierDictionariesMapService,
) {} ) {}
get #userId(): string { get #userId(): string {
@ -307,10 +305,7 @@ export class PermissionsService {
canEditDossierDictionary(dossier: Dossier): boolean { canEditDossierDictionary(dossier: Dossier): boolean {
return ( return (
dossier.isActive && dossier.isActive && this.isDossierMember(dossier) && this._iqserPermissionsService.has(Roles.dossiers.dictionaryEntries.write)
this._dossierDictionariesMapService.get(dossier.id).length > 0 &&
this.isDossierMember(dossier) &&
this._iqserPermissionsService.has(Roles.dossiers.dictionaryEntries.write)
); );
} }

View File

@ -27,6 +27,6 @@ http {
#gzip on; #gzip on;
include /etc/nginx/conf.d/*.conf; # include /etc/nginx/conf.d/*.conf;
include /tmp/*.conf; include /tmp/*.conf;
} }

View File

@ -47,3 +47,6 @@ RUN chmod g+r -R /usr/share/nginx/html
COPY docker/red-ui/09-set-application-config.sh docker-entrypoint.d/ COPY docker/red-ui/09-set-application-config.sh docker-entrypoint.d/
COPY docker/red-ui/40-check-config.sh docker-entrypoint.d/ COPY docker/red-ui/40-check-config.sh docker-entrypoint.d/
# HOTFIX
RUN rm -f /etc/nginx/conf.d/default.conf