From 228904f0cdeb4f6044f6cb04009d6cdb7e01aac9 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Fri, 17 Mar 2023 17:00:57 +0100 Subject: [PATCH] Revert "moves polymorphic_class_for in registered_bookmarkable_from_type" This reverts commit 39aebeac60062ac19d18e6509db11727018bcdfb. --- app/models/bookmark.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb index 498dd6d593..be664d346e 100644 --- a/app/models/bookmark.rb +++ b/app/models/bookmark.rb @@ -10,8 +10,7 @@ class Bookmark < ActiveRecord::Base Set.new(DEFAULT_BOOKMARKABLES | DiscoursePluginRegistry.bookmarkables) end - def self.registered_bookmarkable_from_type(bookmarkable_type) - type = Bookmark.polymorphic_class_for(bookmarkable_type).name + def self.registered_bookmarkable_from_type(type) Bookmark.registered_bookmarkables.find { |bm| bm.model.name == type } end @@ -47,7 +46,8 @@ class Bookmark < ActiveRecord::Base validates :name, length: { maximum: 100 } def registered_bookmarkable - Bookmark.registered_bookmarkable_from_type(self.bookmarkable_type) + type = Bookmark.polymorphic_class_for(self.bookmarkable_type).name + Bookmark.registered_bookmarkable_from_type(type) end def polymorphic_columns_present