From 0804245614bb22162083b7340dedfd2067a64a5a 2016-07-10 07:51:52 From: Jean-Philippe Lang Date: 2016-07-10 07:51:52 Subject: [PATCH] Merged r15610 and r15611 (#23242). git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15617 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb index c549786..3c29f5b 100644 --- a/app/models/wiki_content.rb +++ b/app/models/wiki_content.rb @@ -118,6 +118,10 @@ class WikiContent < ActiveRecord::Base page.project end + def attachments + page.nil? ? [] : page.attachments + end + # Return true if the content is the current page content def current_version? page.content.version == self.version diff --git a/test/unit/wiki_content_version_test.rb b/test/unit/wiki_content_version_test.rb index 79e2166..86f9fc6 100644 --- a/test/unit/wiki_content_version_test.rb +++ b/test/unit/wiki_content_version_test.rb @@ -23,6 +23,11 @@ class WikiContentVersionTest < ActiveSupport::TestCase def setup end + def test_should_respond_to_attachments + v = WikiContent::Version.find(2) + assert v.respond_to?(:attachments) + end + def test_destroy v = WikiContent::Version.find(2)