From 6a71746c0a510702863dcf743c262a4b35fe1def Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Fri, 21 Apr 2017 09:37:32 +0200 Subject: [PATCH] #699 Columns visiblity check optimization --- app/models/dmsf_folder.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index 60bf7673..a049558e 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -50,9 +50,6 @@ class DmsfFolder < ActiveRecord::Base AVAILABLE_COLUMNS = %w(id title extension size modified version workflow author).freeze DEFAULT_COLUMNS = %w(title size modified version workflow author).freeze - @@dmsf_columns = Setting.plugin_redmine_dmsf['dmsf_columns'] - @@dmsf_columns = DmsfFolder::DEFAULT_COLUMNS unless columns - scope :visible, -> { joins(:project).joins( "LEFT JOIN #{DmsfFolderPermission.table_name} ON #{DmsfFolder.table_name}.id = #{DmsfFolderPermission.table_name}.dmsf_folder_id").where( :deleted => STATUS_ACTIVE).where(DmsfFolder.visible_condition).distinct @@ -337,6 +334,10 @@ class DmsfFolder < ActiveRecord::Base end def self.is_column_on?(column) + unless @@dmsf_columns + @@dmsf_columns = Setting.plugin_redmine_dmsf['dmsf_columns'] + @@dmsf_columns = DmsfFolder::DEFAULT_COLUMNS unless columns + end @@dmsf_columns.include? column end