Merge pull request #11268 from Johnetordoff/fix/ENG-8552

Fix/eng 8552

Author: Johnetordoff

osf/models/mixins.py

@@ -138,7 +138,7 @@ def _complete_add_log(self, log, action, user=None, save=True):
             last_logged = log_date.replace(tzinfo=pytz.utc)
         else:
             recent_log = self.logs.latest('created')
-            log_date = recent_log.date if hasattr(log, 'date') else recent_log.created
+            log_date = recent_log.date if hasattr(recent_log, 'date') else recent_log.created
             last_logged = log_date
 
         if not log.should_hide:

osf_tests/metadata/test_serialized_metadata.py

@@ -176,6 +176,7 @@ def setUp(self):
             mock.patch('osf.models.base.generate_guid', new=osfguid_sequence),
             mock.patch('osf.models.base.Guid.objects.get_or_create', new=osfguid_sequence.get_or_create),
             mock.patch('django.utils.timezone.now', new=forever_now),
+            mock.patch('osf.models.mixins.timezone.now', new=forever_now),
             mock.patch('osf.models.metaschema.RegistrationSchema.absolute_api_v2_url', new='http://fake.example/schema/for/test'),
             mock.patch('osf.models.node.Node.get_verified_links', return_value=[
                 {'target_url': 'https://foo.bar', 'resource_type': 'Other'}