Commit 145f47456474bbfe17c9e99bdb5529d1fc996d9b
1 parent
525240d0
Exists in
master
and in
28 other branches
Fixing require conflict between work_assignment and solr
Showing
2 changed files
with
11 additions
and
10 deletions
Show diff stats
app/models/article.rb
| @@ -640,16 +640,16 @@ class Article < ActiveRecord::Base | @@ -640,16 +640,16 @@ class Article < ActiveRecord::Base | ||
| 640 | # Subclasses aren't (re)loaded, and acts_as_solr | 640 | # Subclasses aren't (re)loaded, and acts_as_solr |
| 641 | # depends on subclasses method to search | 641 | # depends on subclasses method to search |
| 642 | # see http://stackoverflow.com/questions/4138957/activerecordsubclassnotfound-error-when-using-sti-in-rails/4139245 | 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 | def self.f_type_proc(klass) | 654 | def self.f_type_proc(klass) |
| 655 | klass.constantize.type_name | 655 | klass.constantize.type_name |
plugins/work_assignment/lib/ext/uploaded_file.rb