lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-21 11:17:28 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

MediaService hides the RecipeJournal directory.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Dave Reed
2011-02-28 16:37:09 -08:00
parent b23f5127ad
commit ccb838e71b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard.Tests.Modules/Media/Services/MediaServiceTests.cs
View File

@@ -17,6 +17,7 @@ namespace Orchard.Tests.Modules.Media.Services {
private const string FolderName1 = "Folder1"; private const string FolderName1 = "Folder1";
private const string FolderName2 = "Folder2"; private const string FolderName2 = "Folder2";
private const string FolderName3 = "Folder3"; private const string FolderName3 = "Folder3";
private const string FolderRecipeJournal = "RecipeJournal";
private const string InnerDirectory = "MyDir"; private const string InnerDirectory = "MyDir";
@@ -57,7 +58,7 @@ namespace Orchard.Tests.Modules.Media.Services {
? new[] {new StubStorageFolder(FolderName1)} ? new[] {new StubStorageFolder(FolderName1)}
: string.Equals(path, FolderName1) : string.Equals(path, FolderName1)
? new[] {new StubStorageFolder(FolderName2), new StubStorageFolder(FolderName3)} ? new[] {new StubStorageFolder(FolderName2), new StubStorageFolder(FolderName3)}
: new StubStorageFolder[] {}; : string.Equals(path, FolderRecipeJournal) ? new[] { new StubStorageFolder(FolderRecipeJournal), new StubStorageFolder(FolderName1) } : new StubStorageFolder[] { };
}; };
IEnumerable<MediaFolder> mediaFolders = MediaService.GetMediaFolders(null); IEnumerable<MediaFolder> mediaFolders = MediaService.GetMediaFolders(null);
@@ -71,6 +72,10 @@ namespace Orchard.Tests.Modules.Media.Services {
Assert.That(mediaFolders.Count(), Is.EqualTo(2), "Folder1 has 2 sub directories"); Assert.That(mediaFolders.Count(), Is.EqualTo(2), "Folder1 has 2 sub directories");
Assert.That(mediaFolders.FirstOrDefault(mediaFolder => mediaFolder.Name.Equals(FolderName2)), Is.Not.Null, "Correct sub directory in root path"); Assert.That(mediaFolders.FirstOrDefault(mediaFolder => mediaFolder.Name.Equals(FolderName2)), Is.Not.Null, "Correct sub directory in root path");
Assert.That(mediaFolders.FirstOrDefault(mediaFolder => mediaFolder.Name.Equals(FolderName3)), Is.Not.Null, "Correct sub directory in root path"); Assert.That(mediaFolders.FirstOrDefault(mediaFolder => mediaFolder.Name.Equals(FolderName3)), Is.Not.Null, "Correct sub directory in root path");
mediaFolders = MediaService.GetMediaFolders(FolderRecipeJournal);
Assert.That(mediaFolders.Count(), Is.EqualTo(1), "Folder that contains RecipeJournal hides the RecipeJournal directory.");
Assert.That(mediaFolders.FirstOrDefault(mediaFolder => mediaFolder.Name.Equals(FolderName1)), Is.Not.Null, "Correct sub directory in root path");
} }
[Test] [Test]

2
src/Orchard.Web/Modules/Orchard.Media/Services/MediaService.cs
View File

@@ -64,7 +64,7 @@ namespace Orchard.Media.Services {
Size = folder.GetSize(), Size = folder.GetSize(),
LastUpdated = folder.GetLastUpdated(), LastUpdated = folder.GetLastUpdated(),
MediaPath = folder.GetPath() MediaPath = folder.GetPath()
}); }).Where(f => !f.Name.Equals("RecipeJournal", StringComparison.OrdinalIgnoreCase));
} }
/// <summary> /// <summary>