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

RED-6784, remove trailing comma in entrypoint sh, configure default value and fallback, bump version.

Browse Source
This commit is contained in:
George 2023-06-20 14:56:06 +03:00
parent 59652e79da
commit 119c2ae858
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/admin/screens/watermark/watermark-screen/watermark-screen.component.ts
View File

@ -260,7 +260,7 @@ export class WatermarkScreenComponent implements OnInit {
}
async #loadDocument() {
const filename = `blank-${this.#config.WATERMARK_PREVIEW_PAPER_FORMAT}.pdf`;
const filename = `blank-${this.#config.WATERMARK_PREVIEW_PAPER_FORMAT || 'a4'}.pdf`;
const request = this._http.get(`/assets/pdftron/${filename}`, {
responseType: 'blob',
});

4
docker/red-ui/docker-entrypoint.sh
View File

@ -23,7 +23,7 @@ AVAILABLE_OLD_NOTIFICATIONS_MINUTES="${AVAILABLE_OLD_NOTIFICATIONS_MINUTES:-60}"
NOTIFICATIONS_THRESHOLD="${NOTIFICATIONS_THRESHOLD:-1000}"
BASE_TRANSLATIONS_DIRECTORY="${BASE_TRANSLATIONS_DIRECTORY:-/assets/i18n/redact/}"
THEME="${THEME:-theme-template}"
WATERMARK_PREVIEW_PAPER_FORMAT="${WATERMARK_PREVIEW_PAPER_FORMAT:a4}"
WATERMARK_PREVIEW_PAPER_FORMAT="${WATERMARK_PREVIEW_PAPER_FORMAT:-a4}"
@ -50,7 +50,7 @@ echo '{
"AVAILABLE_NOTIFICATIONS_DAYS":"'"$AVAILABLE_NOTIFICATIONS_DAYS"'",
"AVAILABLE_OLD_NOTIFICATIONS_MINUTES":"'"$AVAILABLE_OLD_NOTIFICATIONS_MINUTES"'",
"NOTIFICATIONS_THRESHOLD":"'"$NOTIFICATIONS_THRESHOLD"'",
"WATERMARK_PREVIEW_PAPER_FORMAT":"'"$WATERMARK_PREVIEW_PAPER_FORMAT"'",
"WATERMARK_PREVIEW_PAPER_FORMAT":"'"$WATERMARK_PREVIEW_PAPER_FORMAT"'"
}' > /usr/share/nginx/html/ui/assets/config/config.json
echo 'Env variables: '

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "redaction",
"version": "4.128.0",
"version": "4.129.0",
"private": true,
"license": "MIT",
"scripts": {