From 1960f202c86eac904dc7b3e7c9142d01cf767ca1 Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Fri, 22 Sep 2023 14:58:12 +0200 Subject: [PATCH 1/2] Improved handling of empty titles --- .../search/resultsview/partials/viewtemplates/editor.html | 5 ++++- .../search/resultsview/partials/viewtemplates/grid.html | 1 + web-ui/src/main/resources/catalog/locales/ca-core.json | 3 ++- web-ui/src/main/resources/catalog/locales/cs-core.json | 5 +++-- web-ui/src/main/resources/catalog/locales/da-core.json | 5 +++-- web-ui/src/main/resources/catalog/locales/de-core.json | 5 +++-- web-ui/src/main/resources/catalog/locales/en-core.json | 3 ++- web-ui/src/main/resources/catalog/locales/es-core.json | 5 +++-- web-ui/src/main/resources/catalog/locales/fi-core.json | 3 ++- web-ui/src/main/resources/catalog/locales/fr-core.json | 5 +++-- web-ui/src/main/resources/catalog/locales/is-core.json | 3 ++- web-ui/src/main/resources/catalog/locales/it-core.json | 3 ++- web-ui/src/main/resources/catalog/locales/ko-core.json | 3 ++- web-ui/src/main/resources/catalog/locales/nl-core.json | 5 +++-- web-ui/src/main/resources/catalog/locales/pt-core.json | 3 ++- web-ui/src/main/resources/catalog/locales/ru-core.json | 3 ++- web-ui/src/main/resources/catalog/locales/sk-core.json | 3 ++- web-ui/src/main/resources/catalog/locales/sv-core.json | 5 +++-- web-ui/src/main/resources/catalog/locales/zh-core.json | 3 ++- .../catalog/views/default/directives/partials/infolist.html | 5 ++++- 20 files changed, 50 insertions(+), 26 deletions(-) diff --git a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/editor.html b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/editor.html index e8b6672bd20..e277e8b6956 100644 --- a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/editor.html +++ b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/editor.html @@ -28,7 +28,10 @@ data-ng-href="catalog.search#/{{(md.draft == 'y')?'metadraf':'metadata'}}/{{md.uuid}}" title="{{md.resourceAbstract}}" class="gn-break" - >{{md.resourceTitle}} + {{'missingTitle' | translate}} + {{md.resourceTitle}} + {{md.resourceTitle}}
diff --git a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/grid.html b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/grid.html index c4135133873..df4d4353878 100644 --- a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/grid.html +++ b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/grid.html @@ -33,6 +33,7 @@

title="{{md.resourceTitle}}" class="gn-break" > + {{'missingTitle' | translate}} {{(md.resourceTitle) | characters:80}}

diff --git a/web-ui/src/main/resources/catalog/locales/ca-core.json b/web-ui/src/main/resources/catalog/locales/ca-core.json index 5250d81ca29..3c71e4b5d10 100644 --- a/web-ui/src/main/resources/catalog/locales/ca-core.json +++ b/web-ui/src/main/resources/catalog/locales/ca-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" } diff --git a/web-ui/src/main/resources/catalog/locales/cs-core.json b/web-ui/src/main/resources/catalog/locales/cs-core.json index b6a33dad19b..706a9fcfc1d 100644 --- a/web-ui/src/main/resources/catalog/locales/cs-core.json +++ b/web-ui/src/main/resources/catalog/locales/cs-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "Tato možnost odešle vybraná metadata vlastněná uživatelem.", "reviewerNotAllowedPublish": "Prohlížející nemá oprávnění publikovat metadata", "reviewerNotAllowedUnpublish": "Prohlížející nemůže zrušit publikování metadat", - "reviewerNotAllowedPublishUnpublish": "Prohlížející nemá oprávnění publikovat/zrušit publikování metadat" -} \ No newline at end of file + "reviewerNotAllowedPublishUnpublish": "Prohlížející nemá oprávnění publikovat/zrušit publikování metadat", + "missingTitle": "Missing title" +} diff --git a/web-ui/src/main/resources/catalog/locales/da-core.json b/web-ui/src/main/resources/catalog/locales/da-core.json index 0412cfa4613..06b51fea61b 100644 --- a/web-ui/src/main/resources/catalog/locales/da-core.json +++ b/web-ui/src/main/resources/catalog/locales/da-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "Denne indstilling indsender de valgte metadata, der ejes af brugeren.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" -} \ No newline at end of file + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" +} diff --git a/web-ui/src/main/resources/catalog/locales/de-core.json b/web-ui/src/main/resources/catalog/locales/de-core.json index 82d829f89a1..3f1a25af2e7 100644 --- a/web-ui/src/main/resources/catalog/locales/de-core.json +++ b/web-ui/src/main/resources/catalog/locales/de-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" -} \ No newline at end of file + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" +} diff --git a/web-ui/src/main/resources/catalog/locales/en-core.json b/web-ui/src/main/resources/catalog/locales/en-core.json index 0bed956b822..0a462d1c40c 100644 --- a/web-ui/src/main/resources/catalog/locales/en-core.json +++ b/web-ui/src/main/resources/catalog/locales/en-core.json @@ -575,5 +575,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" } diff --git a/web-ui/src/main/resources/catalog/locales/es-core.json b/web-ui/src/main/resources/catalog/locales/es-core.json index 50c5a006afc..7d84b13f3fd 100644 --- a/web-ui/src/main/resources/catalog/locales/es-core.json +++ b/web-ui/src/main/resources/catalog/locales/es-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" -} \ No newline at end of file + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" +} diff --git a/web-ui/src/main/resources/catalog/locales/fi-core.json b/web-ui/src/main/resources/catalog/locales/fi-core.json index f1f6e871f5f..3584176edec 100644 --- a/web-ui/src/main/resources/catalog/locales/fi-core.json +++ b/web-ui/src/main/resources/catalog/locales/fi-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" } diff --git a/web-ui/src/main/resources/catalog/locales/fr-core.json b/web-ui/src/main/resources/catalog/locales/fr-core.json index 636e9c7f98e..3c0894b4bc1 100644 --- a/web-ui/src/main/resources/catalog/locales/fr-core.json +++ b/web-ui/src/main/resources/catalog/locales/fr-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "Cette option propose les fiches sélectionnées appartenant à l'utilisateur.", "reviewerNotAllowedPublish": "Les relecteurs ne sont pas autorisés à publier des fiches.", "reviewerNotAllowedUnpublish": "Les relecteurs ne sont pas autorisés à dépublier des fiches", - "reviewerNotAllowedPublishUnpublish": "Les relecteurs ne sont pas autorisés à publier/dépublier des fiches" -} \ No newline at end of file + "reviewerNotAllowedPublishUnpublish": "Les relecteurs ne sont pas autorisés à publier/dépublier des fiches", + "missingTitle": "Missing title" +} diff --git a/web-ui/src/main/resources/catalog/locales/is-core.json b/web-ui/src/main/resources/catalog/locales/is-core.json index b44dfd5b00c..c9706b346d8 100644 --- a/web-ui/src/main/resources/catalog/locales/is-core.json +++ b/web-ui/src/main/resources/catalog/locales/is-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" } diff --git a/web-ui/src/main/resources/catalog/locales/it-core.json b/web-ui/src/main/resources/catalog/locales/it-core.json index be7c427c766..109e49622e9 100644 --- a/web-ui/src/main/resources/catalog/locales/it-core.json +++ b/web-ui/src/main/resources/catalog/locales/it-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" } diff --git a/web-ui/src/main/resources/catalog/locales/ko-core.json b/web-ui/src/main/resources/catalog/locales/ko-core.json index d993a7bf04a..85c1fd9fb05 100644 --- a/web-ui/src/main/resources/catalog/locales/ko-core.json +++ b/web-ui/src/main/resources/catalog/locales/ko-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" } diff --git a/web-ui/src/main/resources/catalog/locales/nl-core.json b/web-ui/src/main/resources/catalog/locales/nl-core.json index 294b6d346ce..185892a11e2 100644 --- a/web-ui/src/main/resources/catalog/locales/nl-core.json +++ b/web-ui/src/main/resources/catalog/locales/nl-core.json @@ -574,5 +574,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" -} \ No newline at end of file + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" +} diff --git a/web-ui/src/main/resources/catalog/locales/pt-core.json b/web-ui/src/main/resources/catalog/locales/pt-core.json index cc442e2c02d..639e553045a 100644 --- a/web-ui/src/main/resources/catalog/locales/pt-core.json +++ b/web-ui/src/main/resources/catalog/locales/pt-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" } diff --git a/web-ui/src/main/resources/catalog/locales/ru-core.json b/web-ui/src/main/resources/catalog/locales/ru-core.json index fc0d9c82448..1d48237434e 100644 --- a/web-ui/src/main/resources/catalog/locales/ru-core.json +++ b/web-ui/src/main/resources/catalog/locales/ru-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" } diff --git a/web-ui/src/main/resources/catalog/locales/sk-core.json b/web-ui/src/main/resources/catalog/locales/sk-core.json index c1ed75a554e..2bcff6a2fa1 100644 --- a/web-ui/src/main/resources/catalog/locales/sk-core.json +++ b/web-ui/src/main/resources/catalog/locales/sk-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" } diff --git a/web-ui/src/main/resources/catalog/locales/sv-core.json b/web-ui/src/main/resources/catalog/locales/sv-core.json index 5795671f9de..3f86e74690e 100644 --- a/web-ui/src/main/resources/catalog/locales/sv-core.json +++ b/web-ui/src/main/resources/catalog/locales/sv-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" -} \ No newline at end of file + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" +} diff --git a/web-ui/src/main/resources/catalog/locales/zh-core.json b/web-ui/src/main/resources/catalog/locales/zh-core.json index f6b259bf10c..69d3f52e7d3 100644 --- a/web-ui/src/main/resources/catalog/locales/zh-core.json +++ b/web-ui/src/main/resources/catalog/locales/zh-core.json @@ -573,5 +573,6 @@ "batchSubmitInfo": "This option submits the selected metadata owned by the user.", "reviewerNotAllowedPublish": "Reviewer not allowed to publish the metadata", "reviewerNotAllowedUnpublish": "Reviewer not allowed to un-publish the metadata", - "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata" + "reviewerNotAllowedPublishUnpublish": "Reviewer not allowed to publish / un-publish the metadata", + "missingTitle": "Missing title" } diff --git a/web-ui/src/main/resources/catalog/views/default/directives/partials/infolist.html b/web-ui/src/main/resources/catalog/views/default/directives/partials/infolist.html index 7e5347abbf0..37decbc53a6 100644 --- a/web-ui/src/main/resources/catalog/views/default/directives/partials/infolist.html +++ b/web-ui/src/main/resources/catalog/views/default/directives/partials/infolist.html @@ -18,7 +18,10 @@ gn-formatter="formatter.defaultUrl" >

- {{md.resourceTitle}} + + {{'missingTitle' | translate}} + {{md.resourceTitle}} +

From 739bb6ade78e45396ff387c6ac0fdddcdcc3c8e4 Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Tue, 26 Sep 2023 14:16:45 +0200 Subject: [PATCH 2/2] Fixed mdResourceTitle typo --- .../search/resultsview/partials/viewtemplates/editor.html | 8 +++++--- .../search/resultsview/partials/viewtemplates/grid.html | 4 +++- .../views/default/directives/partials/infolist.html | 5 ++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/editor.html b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/editor.html index e277e8b6956..967d1289515 100644 --- a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/editor.html +++ b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/editor.html @@ -28,11 +28,13 @@ data-ng-href="catalog.search#/{{(md.draft == 'y')?'metadraf':'metadata'}}/{{md.uuid}}" title="{{md.resourceAbstract}}" class="gn-break" + > + {{'missingTitle' | translate}} - {{'missingTitle' | translate}} {{md.resourceTitle}} - + {{md.resourceTitle}}
owner: diff --git a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/grid.html b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/grid.html index df4d4353878..663f94f46c6 100644 --- a/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/grid.html +++ b/web-ui/src/main/resources/catalog/components/search/resultsview/partials/viewtemplates/grid.html @@ -33,7 +33,9 @@

title="{{md.resourceTitle}}" class="gn-break" > - {{'missingTitle' | translate}} + {{'missingTitle' | translate}} {{(md.resourceTitle) | characters:80}}

diff --git a/web-ui/src/main/resources/catalog/views/default/directives/partials/infolist.html b/web-ui/src/main/resources/catalog/views/default/directives/partials/infolist.html index 37decbc53a6..aad3af6a689 100644 --- a/web-ui/src/main/resources/catalog/views/default/directives/partials/infolist.html +++ b/web-ui/src/main/resources/catalog/views/default/directives/partials/infolist.html @@ -19,7 +19,10 @@ >

- {{'missingTitle' | translate}} + {{'missingTitle' | translate}} {{md.resourceTitle}}