From 145f47456474bbfe17c9e99bdb5529d1fc996d9b Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Wed, 14 Nov 2012 20:30:29 +0000
Subject: [PATCH] Fixing require conflict between work_assignment and solr

---
 app/models/article.rb                            | 20 ++++++++++----------
 plugins/work_assignment/lib/ext/uploaded_file.rb |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/models/article.rb b/app/models/article.rb
index 7b6dbce..033af35 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -640,16 +640,16 @@ class Article < 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
diff --git a/plugins/work_assignment/lib/ext/uploaded_file.rb b/plugins/work_assignment/lib/ext/uploaded_file.rb
index 8574b83..1165c7d 100644
--- a/plugins/work_assignment/lib/ext/uploaded_file.rb
+++ b/plugins/work_assignment/lib/ext/uploaded_file.rb
@@ -1,3 +1,4 @@
+require_dependency 'article'
 require_dependency 'uploaded_file'
 
 class UploadedFile < Article
--
libgit2 0.21.2