From e8b8be54c7c5ce9bd59482e156fa8eb53c08445f Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Thu, 16 Feb 2017 12:40:39 +0100 Subject: [PATCH] Linking Issues and DMSF Documents #48 - rollback --- app/models/dmsf_file.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index c79bd250..27982d34 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -326,8 +326,9 @@ 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.allowed_to_condition(user, :view_dmsf_files) + + project_conditions = [] + 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(