Download as
Browse Code »

Commit 145f47456474bbfe17c9e99bdb5529d1fc996d9b

Authored by Rodrigo Souto
1 parent 525240d0
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

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
  Diff comments   View file @145f474
... ... @@ -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
... ...
plugins/work_assignment/lib/ext/uploaded_file.rb
  Diff comments   View file @145f474
  1 +require_dependency 'article'
1 2 require_dependency 'uploaded_file'
2 3  
3 4 class UploadedFile < Article
... ...