[mapguide-commits] r4987 - in trunk/Tools/Maestro:
Maestro/ResourceEditors MaestroAPI
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Jul 1 22:31:42 EDT 2010
Author: jng
Date: 2010-07-02 02:31:42 +0000 (Fri, 02 Jul 2010)
New Revision: 4987
Modified:
trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditorBase.cs
trunk/Tools/Maestro/MaestroAPI/SiteVersion.cs
Log:
Fix #1384: Add MapGuide Enterprise 2011 to list of known site versions and refine version check for disabling local feature source previews
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditorBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditorBase.cs 2010-06-28 06:55:03 UTC (rev 4986)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/FeatureSourceEditorBase.cs 2010-07-02 02:31:42 UTC (rev 4987)
@@ -120,11 +120,12 @@
var conn = editor.CurrentConnection as MaestroAPI.LocalNativeConnection;
if (conn == null) //Must be HTTP
{
- //This feature is broken for any MG release < 2.2 so disable it.
+ Version ver = editor.CurrentConnection.SiteVersion;
- Version ver = editor.CurrentConnection.SiteVersion;
- Version supported = new Version(2, 2);
- if (ver < supported)
+ //Ticket #708 fix landed on this revision, so disable local preview for versions
+ //older than this
+ Version versionFix = new Version(2, 2, 0, 4939);
+ if (ver <= versionFix || ver == SiteVersions.GetVersion(KnownSiteVersions.MapGuideEP2011))
EditorTab.Controls.Remove(LocalPreviewPage);
}
}
Modified: trunk/Tools/Maestro/MaestroAPI/SiteVersion.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/SiteVersion.cs 2010-06-28 06:55:03 UTC (rev 4986)
+++ trunk/Tools/Maestro/MaestroAPI/SiteVersion.cs 2010-07-02 02:31:42 UTC (rev 4987)
@@ -77,7 +77,11 @@
/// <summary>
/// MapGuide Open Source 2.1.0
/// </summary>
- MapGuideOS2_1,
+ MapGuideOS2_1,
+ /// <summary>
+ /// MapGuide Enterprise 2011
+ /// </summary>
+ MapGuideEP2011,
}
public class SiteVersions
@@ -100,6 +104,7 @@
new Version(2,1,0,3505), //MGE 2010 Update 1
new Version(2,1,0,3701), //MGE 2010 Update 1b
new Version(2,1,0,4283), //MGOS 2.1.0
+ new Version(2,2,0,5305), //MGE 2011
};
/// <summary>
More information about the mapguide-commits
mailing list