From 7209d9d1e00212968fff805a0bb0fe480f269bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Fri, 22 May 2015 10:22:11 +0200
Subject: [PATCH] Redmine 3.0 compatibility

---
 app/models/dmsf_folder.rb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index 0eac7179..4390b7e9 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -72,12 +72,19 @@ class DmsfFolder < ActiveRecord::Base
 
   acts_as_customizable
   
-  acts_as_searchable :columns => ["#{self.table_name}.title", "#{self.table_name}.description"],
+  if (Rails::VERSION::MAJOR > 3)
+    acts_as_searchable :columns => ["#{self.table_name}.title", "#{self.table_name}.description"],
           :project_key => 'project_id',
           :date_column => 'updated_at',
           :permission => :view_dmsf_files,
-          :scope => self.joins(:project),
-          :include => :project # Redmine < 3.0.0 compatibility
+          :scope => self.joins(:project)
+  else        
+    acts_as_searchable :columns => ["#{self.table_name}.title", "#{self.table_name}.description"],
+          :project_key => 'project_id',
+          :date_column => 'updated_at',
+          :permission => :view_dmsf_files,          
+          :include => :project
+  end
         
   acts_as_event :title => Proc.new {|o| o.title},
           :description => Proc.new {|o| o.description },