From f0d5e44318dc3a3176b4b7c83bddd3d38ad91385 Mon Sep 17 00:00:00 2001 From: Andy Byers Date: Mon, 4 Nov 2024 12:30:10 +0000 Subject: [PATCH 1/2] #4479 fixes submitted and accepted date display --- src/submission/models.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/submission/models.py b/src/submission/models.py index 80e953776..57a74e176 100755 --- a/src/submission/models.py +++ b/src/submission/models.py @@ -906,15 +906,30 @@ def metrics(self): def has_galley(self): return self.galley_set.all().exists() + @cache(600) + def publication_detail_settings(self): + display_date_accepted = self.journal.get_setting( + group_name='article', + setting_name='display_date_accepted', + ) + display_date_submitted = self.journal.get_setting( + group_name='article', + setting_name='display_date_submitted', + ) + return display_date_submitted, display_date_accepted + @property def has_publication_details(self): """Determines if an article has publication details override""" + display_date_submitted, display_date_accepted = self.publication_detail_settings() return( self.page_range or self.article_number or self.publisher_name or self.publication_title or self.ISSN_override + or (display_date_submitted and self.date_submitted) + or (display_date_accepted and self.date_accepted) ) @property From 055f982a2fa5229f3fea75f4245f30add24dc5f0 Mon Sep 17 00:00:00 2001 From: Andy Byers Date: Tue, 5 Nov 2024 10:27:40 +0000 Subject: [PATCH 2/2] publication_detail_settings is now a static method --- src/submission/models.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/submission/models.py b/src/submission/models.py index 57a74e176..e75deb25f 100755 --- a/src/submission/models.py +++ b/src/submission/models.py @@ -906,13 +906,14 @@ def metrics(self): def has_galley(self): return self.galley_set.all().exists() + @staticmethod @cache(600) - def publication_detail_settings(self): - display_date_accepted = self.journal.get_setting( + def publication_detail_settings(journal): + display_date_accepted = journal.get_setting( group_name='article', setting_name='display_date_accepted', ) - display_date_submitted = self.journal.get_setting( + display_date_submitted = journal.get_setting( group_name='article', setting_name='display_date_submitted', ) @@ -921,7 +922,7 @@ def publication_detail_settings(self): @property def has_publication_details(self): """Determines if an article has publication details override""" - display_date_submitted, display_date_accepted = self.publication_detail_settings() + display_date_submitted, display_date_accepted = self.publication_detail_settings(self.journal) return( self.page_range or self.article_number