Mercurial > gemma
changeset 5731:5a0fbdda6e2d
Merged
| author | Sascha Wilde <wilde@intevation.de> |
|---|---|
| date | Tue, 28 May 2024 18:20:58 +0200 |
| parents | 61eff98a40ae (current diff) a88d9f588aec (diff) |
| children | 9dbef85c6bb4 |
| files | pkg/controllers/importqueue.go |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue May 28 14:51:32 2024 +0200 +++ b/.hgtags Tue May 28 18:20:58 2024 +0200 @@ -46,3 +46,4 @@ 4774956ccf871e221528389545c24642851b74a8 v5.6 ff0af91a7f62fca950e8655e16501b7c6547b841 v5.7 9b3779f649c23c0b1a33170149758113691e6dfe v5.7.1 +770681f873100d51b3f9cfb04ddf490d240d0636 v5.7.3
--- a/client/package.json Tue May 28 14:51:32 2024 +0200 +++ b/client/package.json Tue May 28 18:20:58 2024 +0200 @@ -1,6 +1,6 @@ { "name": "gemmajs", - "version": "5.7.3-dev", + "version": "5.7.4-dev", "license": "AGPL-3.0-or-later", "repository": { "type": "hg",
--- a/pkg/controllers/importqueue.go Tue May 28 14:51:32 2024 +0200 +++ b/pkg/controllers/importqueue.go Tue May 28 18:20:58 2024 +0200 @@ -74,6 +74,8 @@ signer, EXISTS(SELECT 1 FROM import.import_logs WHERE kind = 'warn'::log_type and import_id = id) AS has_warnings, + EXISTS(SELECT 1 FROM import.import_logs + WHERE kind = 'error'::log_type and import_id = id) AS has_errors, data, CASE WHEN kind = ANY($1) THEN ARRAY(SELECT msg FROM import.import_logs WHERE import_id = id) ELSE NULL @@ -311,6 +313,7 @@ "#signer", "#state", "#warnings", + "#errors", "#source", } @@ -346,6 +349,7 @@ country string signer sql.NullString warnings bool + errors bool data string msgs pgtype.TextArray } @@ -395,7 +399,8 @@ record[6] = signer record[7] = ds.state record[8] = strconv.FormatBool(ds.warnings) - record[9] = description + record[9] = strconv.FormatBool(ds.errors) + record[10] = description return out.Write(record) } @@ -413,6 +418,7 @@ &curr.country, &curr.signer, &curr.warnings, + &curr.errors, &curr.data, &curr.msgs, ); err != nil {