From 468f88887abf3df12122a7eb015f3e3887c80253 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Thu, 16 Feb 2017 12:37:43 +0100 Subject: [PATCH] Linking Issues and DMSF Documents #48 --- app/models/dmsf_file.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index 27982d34..c79bd250 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -326,9 +326,8 @@ class DmsfFile < ActiveRecord::Base sql = (['(' + token_clauses.join(' OR ') + ')'] * tokens.size).join(options[:all_words] ? ' AND ' : ' OR ') find_options = [sql, * (tokens.collect {|w| "%#{w.downcase}%"} * token_clauses.size).sort] - - project_conditions = [] - project_conditions << Project.allowed_to_condition(user, :view_dmsf_files) + + project_conditions = Project.allowed_to_condition(user, :view_dmsf_files) project_conditions << "#{Project.table_name}.id IN (#{project_ids.join(',')})" if project_ids.present? scope = self.visible.joins(:dmsf_file_revisions).joins(