From cdafea824ecc0106557209647075569411beadcb Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 6 Mar 2023 09:25:02 +0100 Subject: [PATCH 1/2] refs #3723 Set docker memory limit --- docker-compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 3d82bab1..fb21ab7b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,9 @@ services: placement: constraints: - node.role == worker + resources: + limits: + memory: 2G cron: image: registry.verdnatura.es/hedera-web:${BRANCH_NAME:?} command: 'cron -f' @@ -35,6 +38,9 @@ services: placement: constraints: - node.role == worker + resources: + limits: + memory: 1G configs: config: external: true -- 2.40.1 From 42f682739eab5b39f8c4c55a49b188b6f9e97a57 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 7 Mar 2023 08:50:12 +0100 Subject: [PATCH 2/2] refs #3867 Fix: display message of forbidden errors --- debian/changelog | 2 +- js/hedera/app.js | 7 ++++--- package.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index a2cdbfb1..354d9990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (23.6.8) stable; urgency=low +hedera-web (23.6.9) stable; urgency=low * Initial Release. diff --git a/js/hedera/app.js b/js/hedera/app.js index 2ddc98dd..bfde9e4d 100644 --- a/js/hedera/app.js +++ b/js/hedera/app.js @@ -238,9 +238,10 @@ module.exports = new Class({ if (err instanceof Vn.JsonException) { const statusCode = err.statusCode; if (statusCode >= 400 && statusCode < 500) { - if (err.statusCode == 403) - Htk.Toast.showError(_('You don\'t have enough privileges')); - else { + if (err.statusCode == 403) { + Htk.Toast.showError(err.message || + _('You don\'t have enough privileges')); + } else { switch (err.exception) { case 'UserDisabledError': case 'OutdatedVersionError': diff --git a/package.json b/package.json index 5a11b3a9..5d777aef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "23.6.8", + "version": "23.6.9", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { -- 2.40.1