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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Valentin Mihai 2023-07-16 22:19:57 +03:00
commit 831ced7ac9
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts
View File

@ -107,7 +107,7 @@ export class AdminSideNavComponent implements OnInit {
screen: 'watermarks', screen: 'watermarks',
label: _('admin-side-nav.watermarks'), label: _('admin-side-nav.watermarks'),
helpModeKey: 'watermarks', helpModeKey: 'watermarks',
show: true, show: !this._permissionsService.has(Roles.getRss),
}, },
{ {
screen: 'file-attributes', screen: 'file-attributes',

36
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html
View File

@ -18,26 +18,26 @@
formControlName="downloadFileTypes" formControlName="downloadFileTypes"
></redaction-select> ></redaction-select>
</div> </div>
<ng-container *deny="roles.getRss">
<p class="heading">{{ 'dossier-watermark-selector.heading' | translate }}</p>
<ng-container *ngIf="ctx.existsWatermarks; else noWatermarks">
<redaction-watermark-selector
[dossierTemplateId]="dossier.dossierTemplateId"
[isReadonly]="!canEditDossier"
[label]="'dossier-watermark-selector.watermark' | translate"
formControlName="watermarkId"
>
</redaction-watermark-selector>
<p class="heading">{{ 'dossier-watermark-selector.heading' | translate }}</p> <redaction-watermark-selector
<ng-container *ngIf="ctx.existsWatermarks; else noWatermarks"> [dossierTemplateId]="dossier.dossierTemplateId"
<redaction-watermark-selector [isReadonly]="!canEditDossier"
[dossierTemplateId]="dossier.dossierTemplateId" [label]="'dossier-watermark-selector.preview' | translate"
[isReadonly]="!canEditDossier" formControlName="previewWatermarkId"
[label]="'dossier-watermark-selector.watermark' | translate" >
formControlName="watermarkId" </redaction-watermark-selector>
> </ng-container>
</redaction-watermark-selector>
<redaction-watermark-selector
[dossierTemplateId]="dossier.dossierTemplateId"
[isReadonly]="!canEditDossier"
[label]="'dossier-watermark-selector.preview' | translate"
formControlName="previewWatermarkId"
>
</redaction-watermark-selector>
</ng-container> </ng-container>
<ng-template #noWatermarks> <ng-template #noWatermarks>
<p [innerHTML]="'dossier-watermark-selector.no-watermark' | translate" class="no-watermark"></p> <p [innerHTML]="'dossier-watermark-selector.no-watermark' | translate" class="no-watermark"></p>
</ng-template> </ng-template>

4
apps/red-ui/src/assets/config/config.json
View File

@ -1,7 +1,7 @@
{ {
"ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_NAME": null,
"ADMIN_CONTACT_URL": null, "ADMIN_CONTACT_URL": null,
"API_URL": "https://dev-02.iqser.cloud", "API_URL": "https://dev-04.iqser.cloud",
"APP_NAME": "RedactManager", "APP_NAME": "RedactManager",
"AUTO_READ_TIME": 3, "AUTO_READ_TIME": 3,
"BACKEND_APP_VERSION": "4.4.40", "BACKEND_APP_VERSION": "4.4.40",
@ -11,7 +11,7 @@
"MAX_RETRIES_ON_SERVER_ERROR": 3, "MAX_RETRIES_ON_SERVER_ERROR": 3,
"OAUTH_CLIENT_ID": "redaction", "OAUTH_CLIENT_ID": "redaction",
"OAUTH_IDP_HINT": null, "OAUTH_IDP_HINT": null,
"OAUTH_URL": "https://dev-02.iqser.cloud/auth", "OAUTH_URL": "https://dev-04.iqser.cloud/auth",
"RECENT_PERIOD_IN_HOURS": 24, "RECENT_PERIOD_IN_HOURS": 24,
"SELECTION_MODE": "structural", "SELECTION_MODE": "structural",
"MANUAL_BASE_URL": "https://docs.redactmanager.com/preview", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview",