From caaad57691d37cd64948971df4b2d0b09e86f740 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Thu, 6 Nov 2014 23:54:34 +0100 Subject: [PATCH] Only use activity log after system init is done. --- app/models/application_model/activity_stream_base.rb | 3 +++ app/models/ticket/activity_stream_log.rb | 3 +++ app/models/ticket/article/activity_stream_log.rb | 3 +++ 3 files changed, 9 insertions(+) diff --git a/app/models/application_model/activity_stream_base.rb b/app/models/application_model/activity_stream_base.rb index d2d0155a8..1f0317712 100644 --- a/app/models/application_model/activity_stream_base.rb +++ b/app/models/application_model/activity_stream_base.rb @@ -23,6 +23,9 @@ returns # return if we run import mode return if Setting.get('import_mode') + # return if we run on init mode + return if !Setting.get('system_init_done') + role = self.class.activity_stream_support_config[:role] updated_at = self.updated_at if force diff --git a/app/models/ticket/activity_stream_log.rb b/app/models/ticket/activity_stream_log.rb index c79e3a9a7..889f02131 100644 --- a/app/models/ticket/activity_stream_log.rb +++ b/app/models/ticket/activity_stream_log.rb @@ -20,6 +20,9 @@ returns # return if we run import mode return if Setting.get('import_mode') + # return if we run on init mode + return if !Setting.get('system_init_done') + return if !self.class.activity_stream_support_config role = self.class.activity_stream_support_config[:role] ActivityStream.add( diff --git a/app/models/ticket/article/activity_stream_log.rb b/app/models/ticket/article/activity_stream_log.rb index 19427c909..a0aeb33f0 100644 --- a/app/models/ticket/article/activity_stream_log.rb +++ b/app/models/ticket/article/activity_stream_log.rb @@ -20,6 +20,9 @@ returns # return if we run import mode return if Setting.get('import_mode') + # return if we run on init mode + return if !Setting.get('system_init_done') + return if !self.class.activity_stream_support_config role = self.class.activity_stream_support_config[:role] ticket = Ticket.lookup( :id => self.ticket_id )