From d0f3a4efdb5b93482a4cd566d2cc34c8dc947fce Mon Sep 17 00:00:00 2001 From: Matteo Tomasini Date: Fri, 26 Mar 2010 14:39:38 +0000 Subject: [PATCH] --- AssemblyVersion.cs | 4 ++-- SqlProvidersCommon/SqlPagesStorageProviderBase.cs | 5 +++-- TestScaffolding/PagesStorageProviderTestScaffolding.cs | 7 +++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs index 3b99139..b539c27 100644 --- a/AssemblyVersion.cs +++ b/AssemblyVersion.cs @@ -16,5 +16,5 @@ using System.Reflection; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.0.2.518")] -[assembly: AssemblyFileVersion("3.0.2.518")] +[assembly: AssemblyVersion("3.0.2.519")] +[assembly: AssemblyFileVersion("3.0.2.519")] diff --git a/SqlProvidersCommon/SqlPagesStorageProviderBase.cs b/SqlProvidersCommon/SqlPagesStorageProviderBase.cs index 4b0b4d3..18dc9c5 100644 --- a/SqlProvidersCommon/SqlPagesStorageProviderBase.cs +++ b/SqlProvidersCommon/SqlPagesStorageProviderBase.cs @@ -1126,10 +1126,11 @@ namespace ScrewTurn.Wiki.Plugins.SqlCommon { newCategories = new string[pageCategories.Count]; for(int i = 0; i < pageCategories.Count; i++) { - if(GetCategory(transaction, NameTools.GetFullName(tempName, pageCategories[i])) == null) { + string catName = NameTools.GetFullName(tempName, pageCategories[i]); + if(GetCategory(transaction, catName) == null) { CategoryInfo added = AddCategory(tempName, pageCategories[i]); - newCategories[i] = added.FullName; } + newCategories[i] = catName; } } diff --git a/TestScaffolding/PagesStorageProviderTestScaffolding.cs b/TestScaffolding/PagesStorageProviderTestScaffolding.cs index 3e1f721..e4b3bb2 100644 --- a/TestScaffolding/PagesStorageProviderTestScaffolding.cs +++ b/TestScaffolding/PagesStorageProviderTestScaffolding.cs @@ -361,6 +361,7 @@ namespace ScrewTurn.Wiki.Tests { NamespaceInfo ns = prov.AddNamespace("Namespace"); CategoryInfo cat1 = prov.AddCategory(null, "Category1"); CategoryInfo cat2 = prov.AddCategory(null, "Category2"); + CategoryInfo cat1ns = prov.AddCategory(ns.Name, "Category1"); CategoryInfo cat3 = prov.AddCategory(ns.Name, "Category3"); PageInfo page = prov.AddPage(null, "Page", DateTime.Now); @@ -443,14 +444,15 @@ namespace ScrewTurn.Wiki.Tests { NamespaceInfo ns = prov.AddNamespace("Namespace"); CategoryInfo cat1 = prov.AddCategory(null, "Category1"); - CategoryInfo cat2 = prov.AddCategory(ns.Name, "Category2"); + CategoryInfo cat2 = prov.AddCategory(null, "Category2"); + CategoryInfo cat2ns = prov.AddCategory(ns.Name, "Category2"); CategoryInfo cat3 = prov.AddCategory(ns.Name, "Category3"); PageInfo page = prov.AddPage(ns.Name, "Page", DateTime.Now); prov.ModifyPage(page, "Title", "NUnit", DateTime.Now, "Comment", "Content", null, null, SaveMode.Normal); prov.ModifyPage(page, "Title0", "NUnit0", DateTime.Now, "Comment0", "Content0", null, null, SaveMode.Backup); prov.ModifyPage(page, "Title1", "NUnit1", DateTime.Now, "Comment1", "Content1", null, null, SaveMode.Backup); - prov.RebindPage(page, new string[] { cat2.FullName }); + prov.RebindPage(page, new string[] { cat2ns.FullName }); prov.AddMessage(page, "NUnit", "Test", DateTime.Now, "Body", -1); PageInfo moved = prov.MovePage(page, null, true); @@ -529,6 +531,7 @@ namespace ScrewTurn.Wiki.Tests { NamespaceInfo ns2 = prov.AddNamespace("Namespace2"); CategoryInfo cat1 = prov.AddCategory(ns1.Name, "Category1"); CategoryInfo cat2 = prov.AddCategory(ns1.Name, "Category2"); + CategoryInfo cat2ns2 = prov.AddCategory(ns2.Name, "Category2"); CategoryInfo cat3 = prov.AddCategory(ns2.Name, "Category3"); PageInfo page = prov.AddPage(ns1.Name, "Page", DateTime.Now);