Fixing require conflict between work_assignment and solr

Rodrigo Souto
1 parent 525240d0
Showing 2 changed files with 11 additions and 10 deletions Show diff stats
app/models/article.rb
plugins/work_assignment/lib/ext/uploaded_file.rb
@@ -640,16 +640,16 @@ class Article &lt; ActiveRecord::Base
   # Subclasses aren't (re)loaded, and acts_as_solr
   # depends on subclasses method to search
   # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245
-#  UploadedFile
-#  TextArticle
-#  TinyMceArticle
-#  TextileArticle
-#  Folder
-#  EnterpriseHomepage
-#  Gallery
-#  Blog
-#  Forum
-#  Event
+  UploadedFile
+  TextArticle
+  TinyMceArticle
+  TextileArticle
+  Folder
+  EnterpriseHomepage
+  Gallery
+  Blog
+  Forum
+  Event
  
   def self.f_type_proc(klass)
     klass.constantize.type_name
+require_dependency 'article'
 require_dependency 'uploaded_file'
  
 class UploadedFile < Article
...	...	@@ -640,16 +640,16 @@ class Article < ActiveRecord::Base
640	640	# Subclasses aren't (re)loaded, and acts_as_solr
641	641	# depends on subclasses method to search
642	642	# see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245
643		-# UploadedFile
644		-# TextArticle
645		-# TinyMceArticle
646		-# TextileArticle
647		-# Folder
648		-# EnterpriseHomepage
649		-# Gallery
650		-# Blog
651		-# Forum
652		-# Event
	643	+ UploadedFile
	644	+ TextArticle
	645	+ TinyMceArticle
	646	+ TextileArticle
	647	+ Folder
	648	+ EnterpriseHomepage
	649	+ Gallery
	650	+ Blog
	651	+ Forum
	652	+ Event
653	653
654	654	def self.f_type_proc(klass)
655	655	klass.constantize.type_name
...	...
	1	+require_dependency 'article'
1	2	require_dependency 'uploaded_file'
2	3
3	4	class UploadedFile < Article
...	...