From ce10c4afc864807093b12b614909370ff16a9775 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 4 May 2020 22:49:10 +0000 Subject: [PATCH] --- source/Plugins/AyaNova.Plugin.V8/V8.cs | 4 +++- source/WinFormApp/AssemblyInfo.cs | 2 +- source/WinFormApp/config.txt | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs index cd4a05f..c0193d3 100644 --- a/source/Plugins/AyaNova.Plugin.V8/V8.cs +++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs @@ -1606,7 +1606,7 @@ namespace AyaNova.PlugIn.V8 int CurrentLocaleHash = util.GetOrderIndependentHashCode(allStrings); allStrings.Clear(); if (StockLocaleHashes.Contains(CurrentLocaleHash)) continue; - progress.Op("Locale " + i.Locale + " is customized; exporting"); + progress.Append("Locale " + i.Locale + " is customized [signature: "+CurrentLocaleHash.ToString()+"]; exporting"); //collection to hold items sent to server List exportItems = new List(); @@ -2037,7 +2037,9 @@ namespace AyaNova.PlugIn.V8 private async System.Threading.Tasks.Task> ExportCustomFieldSchema(ObjectCustomFields ocf, string v7CustomFieldObjectName, string RavenCustomTranslationKeyObjectName) { + var ret = new List(); + if (ocf == null) return ret; //NOTE: this code inspired by winforApp::Util.cs PrepareCustomFieldsGrid method dynamic d = new JObject(); d.formkey = RavenCustomTranslationKeyObjectName; diff --git a/source/WinFormApp/AssemblyInfo.cs b/source/WinFormApp/AssemblyInfo.cs index 28f2222..5d0d439 100644 --- a/source/WinFormApp/AssemblyInfo.cs +++ b/source/WinFormApp/AssemblyInfo.cs @@ -62,4 +62,4 @@ using System.Runtime.InteropServices; [assembly: log4net.Config.XmlConfigurator(ConfigFile="Log4Net.config",Watch=true)] //[assembly: log4net.Config.XmlConfigurator(Watch=true)] [assembly: ComVisibleAttribute(false)] -[assembly: AssemblyFileVersionAttribute("7.6.2.0")] +[assembly: AssemblyFileVersionAttribute("7.6.3.0")] diff --git a/source/WinFormApp/config.txt b/source/WinFormApp/config.txt index c8e70a1..78b54ce 100644 --- a/source/WinFormApp/config.txt +++ b/source/WinFormApp/config.txt @@ -1,19 +1,19 @@ - + - + DataBase FireBird ServerType=1;DataBase=C:\data\AyaNova\database\AYANOVA.fdb;Dialect=3; --->