From 3884cf00f1ba9de869b8433cdb36d7ffa06b5152 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 2 Sep 2021 13:54:56 +0000 Subject: [PATCH] --- source/Plugins/AyaNova.Plugin.V8/V8.cs | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs index beb20a3..dbffa04 100644 --- a/source/Plugins/AyaNova.Plugin.V8/V8.cs +++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs @@ -485,7 +485,7 @@ namespace AyaNova.PlugIn.V8 V7UseInventory = AyaBizUtils.GlobalSettings.UseInventory; //BIZ objects - + await ExportLocales(progress); await ExportStaffUsers(progress); await ExportRates(progress); @@ -634,7 +634,7 @@ namespace AyaNova.PlugIn.V8 UsedUserNames.Clear(); } - + private async System.Threading.Tasks.Task PostExportLogToV8(ProgressForm progress) { try @@ -1835,6 +1835,8 @@ namespace AyaNova.PlugIn.V8 } d.active = c.Active; d.notes = c.Notes; + TagFromv7Guid(c.PartCategoryID, tags); + SetTags(d, tags); //Custom fields? @@ -4856,19 +4858,19 @@ namespace AyaNova.PlugIn.V8 progress.Append("Export Global / Regional WIKI"); if (!progress.KeepGoing) return; progress.Op("Start Global / Regional WIKI page export"); - progress.SubOp("Global WIKI check"); + progress.SubOp("Global WIKI check"); if (WikiPage.HasWiki(Address.GlobalAddressID)) { progress.SubOp("Global WIKI exists, migrating to special User account"); dynamic d = new JObject(); - d.name = "zV8Migrate GLOBAL_WIKI_REPOSITORY"; + d.name = "zV8Migrate GLOBAL_WIKI_REPOSITORY"; d.active = false; d.userType = 2; d.roles = 0; d.login = util.RandomString(); d.password = util.RandomString(); d.notes = "This record created by V8Migrate utility to contain the AyaNova 7 Global WIKI which has no corresponding place in v8"; - var r= await util.PostAsync("user", d); + var r = await util.PostAsync("user", d); long RavenId = util.IdFromResponse(r); Addv7v8IdMap(Address.GlobalAddressID, RavenId); //FILES / ATTACHMENTS FOR WIKI @@ -4884,9 +4886,9 @@ namespace AyaNova.PlugIn.V8 { if (WikiPage.HasWiki(i.LT_Region_Label_Name.Value)) { - progress.SubOp("Region "+i.LT_Region_Label_Name.Display+" WIKI exists, migrating to special User account"); + progress.SubOp("Region " + i.LT_Region_Label_Name.Display + " WIKI exists, migrating to special User account"); dynamic d = new JObject(); - d.name = "zV8Migrate REGION_WIKI_REPOSITORY_"+i.LT_Region_Label_Name.Display; + d.name = "zV8Migrate REGION_WIKI_REPOSITORY_" + i.LT_Region_Label_Name.Display; d.active = false; d.userType = 2; d.roles = 0; @@ -4897,13 +4899,13 @@ namespace AyaNova.PlugIn.V8 long RavenId = util.IdFromResponse(r); Addv7v8IdMap(i.LT_Region_Label_Name.Value, RavenId); //FILES / ATTACHMENTS FOR WIKI - var tid=new TypeAndID(RootObjectTypes.Region, i.LT_Region_Label_Name.Value); + var tid = new TypeAndID(RootObjectTypes.Region, i.LT_Region_Label_Name.Value); await ExportAttachments(tid, progress, util.AyaType.User); d = r.ObjectResponse["data"]; d.wiki = await GetWikiContent(tid); await util.PutAsync("user", d); } - } + } } #endregion global regional wiki pages @@ -5919,7 +5921,7 @@ namespace AyaNova.PlugIn.V8 { //this is image links to file attachments //if there is no match then chuck it, it's not critically important and already was missing in v7 anyway - var RavenId = await Getv7v8IdMapNullOk(new Guid(m.Groups["guid"].Value), tid.RootObjectType, false,true);//Map[new Guid(m.Groups["guid"].Value)]; + var RavenId = await Getv7v8IdMapNullOk(new Guid(m.Groups["guid"].Value), tid.RootObjectType, false, true);//Map[new Guid(m.Groups["guid"].Value)]; if (RavenId != null) content = content.Replace(m.Value, ""); else