From c1918b6f779a937db0f71fcc4f04405925315a23 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Mon, 25 Apr 2016 12:48:42 +0200 Subject: [PATCH] nautilus-like folders-files list view #252 --- app/models/dmsf_file.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index 3ac69a4a..c8f77f95 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -316,7 +316,7 @@ class DmsfFile < ActiveRecord::Base results = [] - scope = self.visible.joins(:project, :revisions) + scope = self.visible.joins(:project, :dmsf_file_revisions) scope = scope.limit(options[:limit]) unless options[:limit].blank? scope = scope.where(limit_options) unless limit_options.blank? scope = scope.where(project_conditions.join(' AND ')) @@ -330,7 +330,7 @@ class DmsfFile < ActiveRecord::Base Setting.plugin_redmine_dmsf['dmsf_index_database'].strip, lang) database = Xapian::Database.new(databasepath) rescue Exception => e - Rails.logger.warn 'REDMAIN_XAPIAN ERROR: Xapian database is not properly set or initiated or is corrupted.' + Rails.logger.warn "REDMAIN_XAPIAN ERROR: Xapian database is not properly set, initiated or it's corrupted." Rails.logger.warn e.message end