# HG changeset patch # User Chris Cannam # Date 1549547356 0 # Node ID 44cbe9fa0b4ee39fdfcbd5196a3ec6cd774bcde4 # Parent 808a40a7cac71427159d4892a289d7bd3f6c50ff# Parent 76f8f0814e1eeadef4d8971dffe94c724c74f6a1 Merge diff -r 76f8f0814e1e -r 44cbe9fa0b4e lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb --- a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb Fri Aug 10 16:08:05 2018 +0100 +++ b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb Thu Feb 07 13:49:16 2019 +0000 @@ -48,7 +48,7 @@ end def attachments_deletable?(user=User.current) - (respond_to?(:visible?) ? visible?(user) : true) && + (respond_to?(:attachments_visible?) ? attachments_visible?(user) : true) && user.allowed_to?(self.class.attachable_options[:delete_permission], self.project) end