From 406361b06413262f279b10ca55d01f99628d0cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Wed, 17 Aug 2022 14:17:56 +0200 Subject: [PATCH] Issue #1388 patch #1392 --- app/models/dmsf_file.rb | 9 --------- app/models/dmsf_folder.rb | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index b1fd4c29..5c35a1ac 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -82,15 +82,6 @@ class DmsfFile < ActiveRecord::Base @@previews_storage_path = File.join(Rails.root, 'tmp', 'dmsf_previews') before_create :default_values - - def visible? - if self.respond_to?(:type) - if /^folder/.match?(type) - return DmsfFolder.visible.where(id: self.id).exists? - end - end - true - end def default_values if Setting.plugin_redmine_dmsf['dmsf_default_notifications'].present? && (!dmsf_folder || !dmsf_folder.system) diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index 3d11c8f2..5d988e42 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -99,6 +99,15 @@ class DmsfFolder < ActiveRecord::Base before_create :default_values + def visible? + if self.respond_to?(:type) + if /^folder/.match?(type) + return DmsfFolder.visible.where(id: self.id).exists? + end + end + true + end + def self.permissions?(folder, allow_system = true) # Administrator? return true if (User.current.admin? || folder.nil?)