Passing class instances as ActiveRecord attributes is deprecated in R…

…ails 5
projectblacklight · Dec 18, 2015 · 8ccebc8 · 8ccebc8
1 parent 6004cd5
commit 8ccebc8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/controllers/concerns/blacklight/bookmarks.rb b/app/controllers/concerns/blacklight/bookmarks.rb
@@ -97,7 +97,7 @@ def create
   # Beware, :id is the Solr document_id, not the actual Bookmark id.
   # idempotent, as DELETE is supposed to be.
   def destroy
-    bookmark = current_or_guest_user.bookmarks.find_by(document_id: params[:id], document_type: blacklight_config.document_model)
+    bookmark = current_or_guest_user.bookmarks.find_by(document_id: params[:id], document_type: blacklight_config.document_model.to_s)
 
     if bookmark && bookmark.delete && bookmark.destroyed?
       if request.xhr?

diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
@@ -14,7 +14,9 @@ def document
   end
 
   def document_type
-    (super.constantize if defined?(super)) || default_document_type
+    value = super if defined?(super)
+    value &&= value.constantize
+    value ||= default_document_type
   end
 
   def default_document_type

diff --git a/app/models/concerns/blacklight/user.rb b/app/models/concerns/blacklight/user.rb
@@ -12,7 +12,7 @@ def self.included(base)
 
   def bookmarks_for_documents documents = []
     if documents.length > 0
-      bookmarks.where(document_type: documents.first.class.base_class, document_id: documents.map(&:id))
+      bookmarks.where(document_type: documents.first.class.base_class.to_s, document_id: documents.map(&:id))
     else
       []
     end