From 6ecbd67570f120c27b768ad885ea20dfcccafbe7 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Mon, 17 Dec 2018 12:28:28 +0000 Subject: [PATCH 1/2] Build 3.0.16.30 on .Net 4.5.1 --- Doxyfile | 2 +- README.md | 2 +- SuiteCRMAddIn/BusinessLogic/AppointmentsSynchroniser.cs | 7 +++++-- SuiteCRMAddIn/Properties/AssemblyInfo.cs | 2 +- SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl | 2 +- SuiteCRMClient/Properties/AssemblyInfo.cs | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Doxyfile b/Doxyfile index c9a29e01..e4822a0f 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "SuiteCRM Outlook Add-in" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.0.16.26 +PROJECT_NUMBER = 3.0.16.30 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/README.md b/README.md index d080612f..f9580357 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ### What's in this repository -SuiteCRM Outlook Plug-In v 3.0.16.26 +SuiteCRM Outlook Plug-In v 3.0.16.30 This repository has been created to allow community members to collaborate and contribute to the project. diff --git a/SuiteCRMAddIn/BusinessLogic/AppointmentsSynchroniser.cs b/SuiteCRMAddIn/BusinessLogic/AppointmentsSynchroniser.cs index 38b01280..973b55e2 100644 --- a/SuiteCRMAddIn/BusinessLogic/AppointmentsSynchroniser.cs +++ b/SuiteCRMAddIn/BusinessLogic/AppointmentsSynchroniser.cs @@ -137,11 +137,12 @@ protected override void OutlookItemAdded(AppointmentItem olItem) } } - Log.Debug($"OutlookItemAdded, CRM id = {crmId}; Outlook ID = {olItem.EntryID}"); + Log.Debug($"OutlookItemAdded: entry, CRM id = {crmId}; Outlook ID = {olItem.EntryID}"); if (olItem.IsCall()) base.OutlookItemAdded(olItem, Globals.ThisAddIn.CallsSynchroniser); else base.OutlookItemAdded(olItem, Globals.ThisAddIn.MeetingsSynchroniser); + Log.Debug($"OutlookItemAdded: exit, CRM id = {crmId}; Outlook ID = {olItem.EntryID}"); } finally { @@ -161,12 +162,14 @@ protected override void OutlookItemChanged(AppointmentItem olItem) try { var crmId = olItem.GetCrmId(); - Log.Debug($"OutlookItemChanged, CRM id = {crmId}; Outlook ID = {olItem.EntryID}"); + Log.Debug($"OutlookItemChanged: entry, CRM id = {crmId}; Outlook ID = {olItem.EntryID}"); if (olItem.IsCall()) base.OutlookItemChanged(olItem, Globals.ThisAddIn.CallsSynchroniser); else base.OutlookItemChanged(olItem, Globals.ThisAddIn.MeetingsSynchroniser); + + Log.Debug($"OutlookItemChanged: exit, CRM id = {crmId}; Outlook ID = {olItem.EntryID}"); } catch (BadStateTransition bst) { diff --git a/SuiteCRMAddIn/Properties/AssemblyInfo.cs b/SuiteCRMAddIn/Properties/AssemblyInfo.cs index 2251bee9..4edfc553 100644 --- a/SuiteCRMAddIn/Properties/AssemblyInfo.cs +++ b/SuiteCRMAddIn/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.16.26")] +[assembly: AssemblyVersion("3.0.16.30")] [assembly: AssemblyFileVersion("3.0.1")] diff --git a/SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl b/SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl index ac9d1f70..9e2c9e45 100644 --- a/SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl +++ b/SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl @@ -4423,7 +4423,7 @@ RABlAGIAdQBnAAEARQB4AHAAcgBlAHMAcwA= PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS## ProductCode{3BFCFDAB-2396-46E0-A826-0F142CA288EB} ProductNameSuiteCRMAddIn - ProductVersion3.0.16.26 + ProductVersion3.0.16.30 ProgressType0install ProgressType1Installing ProgressType2installed diff --git a/SuiteCRMClient/Properties/AssemblyInfo.cs b/SuiteCRMClient/Properties/AssemblyInfo.cs index a275d85f..7b073651 100644 --- a/SuiteCRMClient/Properties/AssemblyInfo.cs +++ b/SuiteCRMClient/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.16.26")] +[assembly: AssemblyVersion("3.0.16.30")] [assembly: AssemblyFileVersion("1.0.0.0")] From 62ad1268eb28dc3ec4a4982e46fff5eb7d662c31 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Wed, 19 Dec 2018 11:41:58 +0000 Subject: [PATCH 2/2] #4509: Actually, we were trying to sync deletions when we shouldn't Fixed. --- Doxyfile | 2 +- README.md | 2 +- SuiteCRMAddIn/BusinessLogic/SyncDirection.cs | 1 - SuiteCRMAddIn/BusinessLogic/Synchroniser.cs | 7 +++++-- SuiteCRMAddIn/Properties/AssemblyInfo.cs | 2 +- SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl | 2 +- SuiteCRMClient/Properties/AssemblyInfo.cs | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Doxyfile b/Doxyfile index e4822a0f..c3a8e0f7 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "SuiteCRM Outlook Add-in" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 3.0.16.30 +PROJECT_NUMBER = 3.0.16.33 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/README.md b/README.md index f9580357..c638f8bd 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ### What's in this repository -SuiteCRM Outlook Plug-In v 3.0.16.30 +SuiteCRM Outlook Plug-In v 3.0.16.33 This repository has been created to allow community members to collaborate and contribute to the project. diff --git a/SuiteCRMAddIn/BusinessLogic/SyncDirection.cs b/SuiteCRMAddIn/BusinessLogic/SyncDirection.cs index a908f0da..baacf8b2 100644 --- a/SuiteCRMAddIn/BusinessLogic/SyncDirection.cs +++ b/SuiteCRMAddIn/BusinessLogic/SyncDirection.cs @@ -89,6 +89,5 @@ public static bool AllowOutbound(Direction direction) { return (direction == Direction.Import || direction == Direction.BiDirectional); } - } } diff --git a/SuiteCRMAddIn/BusinessLogic/Synchroniser.cs b/SuiteCRMAddIn/BusinessLogic/Synchroniser.cs index aa78f3fc..2fe3ab37 100644 --- a/SuiteCRMAddIn/BusinessLogic/Synchroniser.cs +++ b/SuiteCRMAddIn/BusinessLogic/Synchroniser.cs @@ -632,7 +632,7 @@ protected void Items_ItemChange(object olItem) protected void Items_ItemRemove() { - Log.Debug($"Outlook {folderName} ItemRemove"); + Log.Debug($"Outlook {folderName} ItemRemove: entry"); try { RemoveDeletedItems(); @@ -641,6 +641,7 @@ protected void Items_ItemRemove() { ErrorHandler.Handle($"Failed to handle item(s) removed from {folderName}", problem); } + Log.Debug($"Outlook {folderName} ItemRemove: exit"); } /// @@ -838,7 +839,9 @@ protected void RemoveDeletedItems() var syncStatesCopy = SyncStateManager.Instance.GetSynchronisedItems(); foreach (var syncState in syncStatesCopy) { - var shouldDeleteFromCrm = syncState.IsDeletedInOutlook || !syncState.ShouldSyncWithCrm; + var shouldDeleteFromCrm = this.IsEnabled() && + SyncDirection.AllowOutbound(this.Direction) && + (syncState.IsDeletedInOutlook || !syncState.ShouldSyncWithCrm); if (shouldDeleteFromCrm) RemoveFromCrm(syncState); if (syncState.IsDeletedInOutlook) SyncStateManager.Instance.RemoveSyncState(syncState); } diff --git a/SuiteCRMAddIn/Properties/AssemblyInfo.cs b/SuiteCRMAddIn/Properties/AssemblyInfo.cs index 4edfc553..63f086f4 100644 --- a/SuiteCRMAddIn/Properties/AssemblyInfo.cs +++ b/SuiteCRMAddIn/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.16.30")] +[assembly: AssemblyVersion("3.0.16.33")] [assembly: AssemblyFileVersion("3.0.1")] diff --git a/SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl b/SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl index 9e2c9e45..89fa5d23 100644 --- a/SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl +++ b/SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl @@ -4423,7 +4423,7 @@ RABlAGIAdQBnAAEARQB4AHAAcgBlAHMAcwA= PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS## ProductCode{3BFCFDAB-2396-46E0-A826-0F142CA288EB} ProductNameSuiteCRMAddIn - ProductVersion3.0.16.30 + ProductVersion3.0.16.33 ProgressType0install ProgressType1Installing ProgressType2installed diff --git a/SuiteCRMClient/Properties/AssemblyInfo.cs b/SuiteCRMClient/Properties/AssemblyInfo.cs index 7b073651..fb5038af 100644 --- a/SuiteCRMClient/Properties/AssemblyInfo.cs +++ b/SuiteCRMClient/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.16.30")] +[assembly: AssemblyVersion("3.0.16.33")] [assembly: AssemblyFileVersion("1.0.0.0")]