diff --git a/app/models/concerns/version_creator.rb b/app/models/concerns/version_creator.rb deleted file mode 100644 index 45a1c424a..000000000 --- a/app/models/concerns/version_creator.rb +++ /dev/null @@ -1,33 +0,0 @@ -module VersionCreator - extend ActiveSupport::Concern - - included do - before_create :add_creator - - def add_creator - self.creator_str = ::PaperTrail.whodunnit - true - end - - def add_updator - self.updator_str = ::PaperTrail.whodunnit - true - end - - # returns a user object for a reference - def creator - return nil if creator_str.blank? - - if creator_str =~ /^\d+-AdminUser:/ - creator = AdminUser.find_by(id: creator_str) - elsif creator_str =~ /^\d+-ApiUser:/ - creator = ApiUser.find_by(id: creator_str) - elsif creator_str =~ /^\d+-api-/ # depricated - creator = ApiUser.find_by(id: creator_str) - end - - creator.present? ? creator : creator_str - end - end - -end \ No newline at end of file diff --git a/app/models/legal_document.rb b/app/models/legal_document.rb index 49c0b2730..f9d4cb4eb 100644 --- a/app/models/legal_document.rb +++ b/app/models/legal_document.rb @@ -1,17 +1,19 @@ class LegalDocument < ActiveRecord::Base - extend VersionCreator - - belongs_to :documentable, polymorphic: true - if ENV['legal_document_types'].present? TYPES = ENV['legal_document_types'].split(',').map(&:strip) else - TYPES = %w(pdf bdoc ddoc zip rar gz tar 7z odt doc docx) + TYPES = %w(pdf bdoc ddoc zip rar gz tar 7z odt doc docx).freeze end attr_accessor :body - before_save :save_to_filesystem + belongs_to :documentable, polymorphic: true + + before_create :add_creator + before_save :save_to_filesystem + + + def save_to_filesystem loop do rand = SecureRandom.random_number.to_s.last(4) @@ -26,4 +28,9 @@ class LegalDocument < ActiveRecord::Base File.open(path, 'wb') { |f| f.write(Base64.decode64(body)) } unless Rails.env.test? self.path = path end + + def add_creator + self.creator_str = ::PaperTrail.whodunnit + true + end end diff --git a/app/models/version/legal_document_version.rb b/app/models/version/legal_document_version.rb deleted file mode 100644 index d812b9720..000000000 --- a/app/models/version/legal_document_version.rb +++ /dev/null @@ -1,5 +0,0 @@ -class LegalDocumentVersion < PaperTrail::Version - include VersionSession - self.table_name = :log_legal_documents - self.sequence_name = :log_legal_documents_id_seq -end diff --git a/db/migrate/20151117081204_drop_log_legal_documents.rb b/db/migrate/20151117081204_drop_log_legal_documents.rb index 45802ea0e..2746a5d11 100644 --- a/db/migrate/20151117081204_drop_log_legal_documents.rb +++ b/db/migrate/20151117081204_drop_log_legal_documents.rb @@ -6,7 +6,6 @@ class DropLogLegalDocuments < ActiveRecord::Migration end def down - # removed concern Version, which removed LegalDocumentVersion - fail ActiveRecord::IrreversibleMigration + # we don't want it back end end