aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcedricnjanga2018-04-20 00:20:36 -0700
committercedricnjanga2018-04-20 00:20:36 -0700
commited47d8d2725700f67bd45a2f6c55477cd2c13634 (patch)
tree6c22451fb7d49a47c40ca395752042d2676be877
parente6567cbfc987d8488492e2b1ce66a03db3a3d37d (diff)
downloadchouette-core-ed47d8d2725700f67bd45a2f6c55477cd2c13634.tar.bz2
Refs #6630 Fix server error on clean up
-rw-r--r--app/controllers/concerns/metadata_controller_support.rb2
-rw-r--r--app/models/clean_up.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/metadata_controller_support.rb b/app/controllers/concerns/metadata_controller_support.rb
index 4dcbfe5d0..fc7c9c3df 100644
--- a/app/controllers/concerns/metadata_controller_support.rb
+++ b/app/controllers/concerns/metadata_controller_support.rb
@@ -2,7 +2,7 @@ module MetadataControllerSupport
extend ActiveSupport::Concern
included do
- after_action :set_creator_metadata, only: :create
+ after_action :set_creator_metadata, only: :create, unless: Proc.new {|c| c.is_a? CleanUpsController }
after_action :set_modifier_metadata, only: :update
end
diff --git a/app/models/clean_up.rb b/app/models/clean_up.rb
index ec47489e9..ec9d7cd74 100644
--- a/app/models/clean_up.rb
+++ b/app/models/clean_up.rb
@@ -1,4 +1,4 @@
-class CleanUp < ApplicationModel
+class CleanUp < ::ActiveRecord::Base
extend Enumerize
include AASM
belongs_to :referential