From ea2e3f767615a49826f5e1e3c13fa8df62cfd518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Tue, 31 Mar 2015 12:06:48 +0200 Subject: [PATCH] search is broken on redmine3 #370 --- app/models/dmsf_file.rb | 5 +++++ app/models/dmsf_folder.rb | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index 6d061188..2f125043 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -422,6 +422,11 @@ class DmsfFile < ActiveRecord::Base [results, results_count] end + + def self.search_result_ranks_and_ids(tokens, user = User.current, projects = nil, options = {}) + r = self.search(tokens, projects, options)[0] + r.each_index { |x| [x, r[1][x]] } + end def display_name if self.name.length > 50 diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index 8669c53f..53ddc1f0 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -318,6 +318,10 @@ class DmsfFolder < ActiveRecord::Base [results, results_count] end + + def self.search_result_ranks_and_ids(tokens, user = User.current, projects = nil, options = {}) + self.search(tokens, :user => user, :projects => projects, :options => options) + end def modified last_update = updated_at