From 97fd9db0ae3a87a1abbf040f9a944c5c0b9abc97 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 24 Sep 2025 14:46:31 +0200 Subject: [PATCH 1/4] Fix wrong settings link on own profile page. --- app/templates/users/user.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/users/user.html.j2 b/app/templates/users/user.html.j2 index 89a42188..f8ab2ede 100644 --- a/app/templates/users/user.html.j2 +++ b/app/templates/users/user.html.j2 @@ -90,7 +90,7 @@ {% if current_user == user %}

- Edit profile + Edit profile

{% endif %} From bf130b117d006001488a09d908f59bc9193c5b28 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 24 Sep 2025 14:59:06 +0200 Subject: [PATCH 2/4] Fix wrong color code on contributions lists --- app/static/js/resource-lists/spacy-nlp-pipeline-model-list.js | 2 +- .../js/resource-lists/tesseract-ocr-pipeline-model-list.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/static/js/resource-lists/spacy-nlp-pipeline-model-list.js b/app/static/js/resource-lists/spacy-nlp-pipeline-model-list.js index 49b97bfc..f2c46e40 100644 --- a/app/static/js/resource-lists/spacy-nlp-pipeline-model-list.js +++ b/app/static/js/resource-lists/spacy-nlp-pipeline-model-list.js @@ -33,7 +33,7 @@ nopaque.resource_lists.SpaCyNLPPipelineModelList = class SpaCyNLPPipelineModelLi delete - send + send `.trim(); diff --git a/app/static/js/resource-lists/tesseract-ocr-pipeline-model-list.js b/app/static/js/resource-lists/tesseract-ocr-pipeline-model-list.js index f8e5986a..40e4d533 100644 --- a/app/static/js/resource-lists/tesseract-ocr-pipeline-model-list.js +++ b/app/static/js/resource-lists/tesseract-ocr-pipeline-model-list.js @@ -33,7 +33,7 @@ nopaque.resource_lists.TesseractOCRPipelineModelList = class TesseractOCRPipelin delete - send + send `.trim(); From cdc9a4b6e96355f671d33cb9d36a3b2d97590476 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 24 Sep 2025 14:59:24 +0200 Subject: [PATCH 3/4] Update copyright year --- app/templates/_base/footer.html.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/_base/footer.html.j2 b/app/templates/_base/footer.html.j2 index 9e755ec9..ccc81a78 100644 --- a/app/templates/_base/footer.html.j2 +++ b/app/templates/_base/footer.html.j2 @@ -39,7 +39,7 @@
- © 2024 Bielefeld University + © 2025 Bielefeld University Version {{ config.NOPAQUE_VERSION }}
From 2d3e00745e07db3464ef355abd9a93dbb2d79f7d Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Wed, 24 Sep 2025 15:44:47 +0200 Subject: [PATCH 4/4] seperate user and public models more clearly --- app/blueprints/services/forms.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/blueprints/services/forms.py b/app/blueprints/services/forms.py index 57258c31..acda687d 100644 --- a/app/blueprints/services/forms.py +++ b/app/blueprints/services/forms.py @@ -87,14 +87,14 @@ class CreateTesseractOCRPipelineJobForm(CreateJobBaseForm): user_models = [ x for x in current_user.tesseract_ocr_pipeline_models.order_by(TesseractOCRPipelineModel.title).all() ] - models = [ + public_models = [ x for x in TesseractOCRPipelineModel.query.order_by(TesseractOCRPipelineModel.title).all() - if version in x.compatible_service_versions and (x.is_public == True or x.user == current_user) + if version in x.compatible_service_versions and x.is_public == True ] self.model.choices = { '': [('', 'Choose your option')], 'Your models': [(x.hashid, f'{x.title} [{x.version}]') for x in user_models] if user_models else [(0, 'Nothing here yet...')], - 'Public models': [(x.hashid, f'{x.title} [{x.version}]') for x in models] + 'Public models': [(x.hashid, f'{x.title} [{x.version}]') for x in public_models] } self.model.default = '' self.version.choices = [(x, x) for x in service_manifest['versions']] @@ -176,14 +176,14 @@ class CreateSpacyNLPPipelineJobForm(CreateJobBaseForm): user_models = [ x for x in current_user.spacy_nlp_pipeline_models.order_by(SpaCyNLPPipelineModel.title).all() ] - models = [ - x for x in SpaCyNLPPipelineModel.query.filter(SpaCyNLPPipelineModel.user != current_user, SpaCyNLPPipelineModel.is_public == True).order_by(SpaCyNLPPipelineModel.title).all() - if version in x.compatible_service_versions + public_models = [ + x for x in SpaCyNLPPipelineModel.query.order_by(SpaCyNLPPipelineModel.title).all() + if version in x.compatible_service_versions and x.is_public == True ] self.model.choices = { '': [('', 'Choose your option')], 'Your models': [(x.hashid, f'{x.title} [{x.version}]') for x in user_models] if user_models else [(0, 'Nothing here yet...')], - 'Public models': [(x.hashid, f'{x.title} [{x.version}]') for x in models] + 'Public models': [(x.hashid, f'{x.title} [{x.version}]') for x in public_models] } self.model.default = '' self.version.choices = [(x, x) for x in service_manifest['versions']]