From fa588b8edbf1d8dca3aba00578ec1d4ebe728bae Mon Sep 17 00:00:00 2001
From: Israel Sant'Anna <ibsantanna@inf.ufpr.br>
Date: Fri, 23 Jul 2021 15:27:28 -0300
Subject: [PATCH] Fixed submission answer and activity error
---
app/models/concerns/trackable.rb | 4 ++--
app/models/learning_object.rb | 2 +-
app/models/submission.rb | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/models/concerns/trackable.rb b/app/models/concerns/trackable.rb
index b4ae12664..debab1e93 100644
--- a/app/models/concerns/trackable.rb
+++ b/app/models/concerns/trackable.rb
@@ -29,9 +29,9 @@ module Trackable
end
def new_update_activity
- return nil if changed.blank?
+ return nil if previous_changes.blank?
return new_activity(:update) if ignore_changes == %w(updated_at)
- filtered = changed.reject { |x| ignore_changes.include?(x) }
+ filtered = previous_changes.reject { |x| ignore_changes.include?(x) }
new_activity(:update) unless filtered.empty?
end
diff --git a/app/models/learning_object.rb b/app/models/learning_object.rb
index 79770e3e9..10451b6f8 100644
--- a/app/models/learning_object.rb
+++ b/app/models/learning_object.rb
@@ -79,7 +79,7 @@ class LearningObject < ApplicationRecord
belongs_to :license, optional: true
belongs_to :object_type, optional: true
belongs_to :attachment, class_name: 'LearningObject::Attachment', optional: true
- has_one :submission, dependent: :destroy
+ has_one :submission
validates :name, :publisher, :object_type, :author, presence: true, unless: :draft?
validates :language, unless: :draft?, :length => { :minimum => 1 }
diff --git a/app/models/submission.rb b/app/models/submission.rb
index 08e9a16a0..98bdd8a57 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -49,7 +49,7 @@ class Submission < ApplicationRecord
after_update :update_status
def update_status
- if curator_id_changed?
+ if curator_id_previously_changed?
curator_assignments.each do |ca|
if ca.user == curator
ca.answered!
--
GitLab