make sure ArticleNotAcceptable exception is caught correctly and mess…

…age is displayed as an error
DOAJ · Oct 16, 2023 · 5eba6d1 · 5eba6d1
1 parent 0f27c23
commit 5eba6d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/portality/bll/services/article.py b/portality/bll/services/article.py
@@ -219,6 +219,8 @@ def create_article(self, article, account, duplicate_check=True, merge_duplicate
         # We do this after the permissions check because that gives a detailed result whereas this throws an exception
         try:
             self.is_acceptable(article)
+        except exceptions.ArticleNotAcceptable as e:
+            raise exceptions.ArticleNotAcceptable(message=e.message)
         except Exception as e:
             raise e
 

diff --git a/portality/view/publisher.py b/portality/view/publisher.py
@@ -4,7 +4,7 @@
 
 from portality.app_email import EmailException
 from portality import models
-from portality.bll.exceptions import AuthoriseException, ArticleMergeConflict, DuplicateArticleException
+from portality.bll.exceptions import AuthoriseException, ArticleMergeConflict, DuplicateArticleException, ArticleNotAcceptable
 from portality.decorators import ssl_required, restrict_to_role, write_required
 from portality.dao import ESMappingMissingError
 from portality.forms.application_forms import ApplicationFormFactory
@@ -362,7 +362,8 @@ def metadata():
                 Messages.flash(Messages.ARTICLE_METADATA_MERGE_CONFLICT)
             except DuplicateArticleException:
                 Messages.flash(Messages.ARTICLE_METADATA_UPDATE_CONFLICT)
-
+            except ArticleNotAcceptable as e:
+                Messages.flash_with_param(e.message, "error")
         return fc.render_template(validated=validated)