zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Matteo Tomasini 2010-03-26 14:39:38 +00:00
parent 5f05cecc20
commit d0f3a4efdb
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.2.518")] [assembly: AssemblyVersion("3.0.2.519")]
[assembly: AssemblyFileVersion("3.0.2.518")] [assembly: AssemblyFileVersion("3.0.2.519")]

5
SqlProvidersCommon/SqlPagesStorageProviderBase.cs
View file

@ -1126,10 +1126,11 @@ namespace ScrewTurn.Wiki.Plugins.SqlCommon {
newCategories = new string[pageCategories.Count]; newCategories = new string[pageCategories.Count];
for(int i = 0; i < pageCategories.Count; i++) { 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]); CategoryInfo added = AddCategory(tempName, pageCategories[i]);
newCategories[i] = added.FullName;
} }
newCategories[i] = catName;
} }
} }

7
TestScaffolding/PagesStorageProviderTestScaffolding.cs
View file

@ -361,6 +361,7 @@ namespace ScrewTurn.Wiki.Tests {
NamespaceInfo ns = prov.AddNamespace("Namespace"); NamespaceInfo ns = prov.AddNamespace("Namespace");
CategoryInfo cat1 = prov.AddCategory(null, "Category1"); CategoryInfo cat1 = prov.AddCategory(null, "Category1");
CategoryInfo cat2 = prov.AddCategory(null, "Category2"); CategoryInfo cat2 = prov.AddCategory(null, "Category2");
CategoryInfo cat1ns = prov.AddCategory(ns.Name, "Category1");
CategoryInfo cat3 = prov.AddCategory(ns.Name, "Category3"); CategoryInfo cat3 = prov.AddCategory(ns.Name, "Category3");
PageInfo page = prov.AddPage(null, "Page", DateTime.Now); PageInfo page = prov.AddPage(null, "Page", DateTime.Now);
@ -443,14 +444,15 @@ namespace ScrewTurn.Wiki.Tests {
NamespaceInfo ns = prov.AddNamespace("Namespace"); NamespaceInfo ns = prov.AddNamespace("Namespace");
CategoryInfo cat1 = prov.AddCategory(null, "Category1"); 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"); CategoryInfo cat3 = prov.AddCategory(ns.Name, "Category3");
PageInfo page = prov.AddPage(ns.Name, "Page", DateTime.Now); 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, "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, "Title0", "NUnit0", DateTime.Now, "Comment0", "Content0", null, null, SaveMode.Backup);
prov.ModifyPage(page, "Title1", "NUnit1", DateTime.Now, "Comment1", "Content1", 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); prov.AddMessage(page, "NUnit", "Test", DateTime.Now, "Body", -1);
PageInfo moved = prov.MovePage(page, null, true); PageInfo moved = prov.MovePage(page, null, true);
@ -529,6 +531,7 @@ namespace ScrewTurn.Wiki.Tests {
NamespaceInfo ns2 = prov.AddNamespace("Namespace2"); NamespaceInfo ns2 = prov.AddNamespace("Namespace2");
CategoryInfo cat1 = prov.AddCategory(ns1.Name, "Category1"); CategoryInfo cat1 = prov.AddCategory(ns1.Name, "Category1");
CategoryInfo cat2 = prov.AddCategory(ns1.Name, "Category2"); CategoryInfo cat2 = prov.AddCategory(ns1.Name, "Category2");
CategoryInfo cat2ns2 = prov.AddCategory(ns2.Name, "Category2");
CategoryInfo cat3 = prov.AddCategory(ns2.Name, "Category3"); CategoryInfo cat3 = prov.AddCategory(ns2.Name, "Category3");
PageInfo page = prov.AddPage(ns1.Name, "Page", DateTime.Now); PageInfo page = prov.AddPage(ns1.Name, "Page", DateTime.Now);