diff --git a/DNN Platform/Library/Entities/BaseEntityInfo.cs b/DNN Platform/Library/Entities/BaseEntityInfo.cs
index 1b33f031123..5988f0cd1cb 100644
--- a/DNN Platform/Library/Entities/BaseEntityInfo.cs
+++ b/DNN Platform/Library/Entities/BaseEntityInfo.cs
@@ -10,7 +10,8 @@ namespace DotNetNuke.Entities
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities.Users;
-
+ using Newtonsoft.Json;
+
///
/// BaseEntityInfo provides auditing fields for Core tables.
///
@@ -31,7 +32,8 @@ protected BaseEntityInfo()
///
/// An Integer.
[Browsable(false)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int CreatedByUserID { get; internal set; }
///
@@ -39,7 +41,8 @@ protected BaseEntityInfo()
///
/// A DateTime.
[Browsable(false)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public DateTime CreatedOnDate { get; private set; }
///
@@ -47,7 +50,8 @@ protected BaseEntityInfo()
///
/// An Integer.
[Browsable(false)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int LastModifiedByUserID { get; internal set; }
///
@@ -55,7 +59,8 @@ protected BaseEntityInfo()
///
/// A DateTime.
[Browsable(false)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public DateTime LastModifiedOnDate { get; private set; }
///
diff --git a/DNN Platform/Library/Entities/Content/ContentItem.cs b/DNN Platform/Library/Entities/Content/ContentItem.cs
index dabecf3018f..929311669d2 100644
--- a/DNN Platform/Library/Entities/Content/ContentItem.cs
+++ b/DNN Platform/Library/Entities/Content/ContentItem.cs
@@ -16,6 +16,7 @@ namespace DotNetNuke.Entities.Content
using DotNetNuke.Entities.Content.Taxonomy;
using DotNetNuke.Entities.Modules;
using DotNetNuke.Services.FileSystem;
+ using Newtonsoft.Json;
///
/// The ContentItem class which itself inherits from BaseEntityInfo paves the way for easily adding support for taxonomy,
@@ -85,7 +86,8 @@ public ContentItem()
///
/// metadata collection.
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public NameValueCollection Metadata
{
get
@@ -99,7 +101,8 @@ public NameValueCollection Metadata
///
/// Terms Collection.
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public List Terms
{
get
@@ -112,7 +115,8 @@ public List Terms
/// Gets files that are attached to this ContentItem.
///
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public List Files
{
get { return this._files ?? (this._files = AttachmentController.DeserializeFileInfo(this.Metadata[AttachmentController.FilesKey]).ToList()); }
@@ -122,7 +126,8 @@ public List Files
/// Gets video files attached to this ContentItem.
///
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public List Videos
{
get { return this._videos ?? (this._videos = AttachmentController.DeserializeFileInfo(this.Metadata[AttachmentController.VideoKey]).ToList()); }
@@ -132,7 +137,8 @@ public List Videos
/// Gets images associated with this ContentItem.
///
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public List Images
{
get { return this._images ?? (this._images = AttachmentController.DeserializeFileInfo(this.Metadata[AttachmentController.ImageKey]).ToList()); }
@@ -145,7 +151,8 @@ public List Images
/// The content item id.
///
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public int ContentItemId { get; set; }
///
@@ -174,7 +181,8 @@ public List Images
///
///
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public int ContentTypeId { get; set; }
///
@@ -184,7 +192,8 @@ public List Images
/// true if indexed; otherwise, false.
///
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public bool Indexed { get; set; }
///
@@ -226,7 +235,8 @@ public string ContentTitle
///
/// The Content Workflow State ID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int StateID { get; set; }
///
@@ -238,7 +248,8 @@ public string ContentTitle
///
/// If you derive class has its own key id, please override this property and set the value to your own key id.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public virtual int KeyID
{
get
diff --git a/DNN Platform/Library/Entities/Content/Taxonomy/Term.cs b/DNN Platform/Library/Entities/Content/Taxonomy/Term.cs
index 37b825a26fb..15394bcb492 100644
--- a/DNN Platform/Library/Entities/Content/Taxonomy/Term.cs
+++ b/DNN Platform/Library/Entities/Content/Taxonomy/Term.cs
@@ -14,6 +14,7 @@ namespace DotNetNuke.Entities.Content.Taxonomy
using DotNetNuke.Entities.Content.Common;
using DotNetNuke.Entities.Modules;
using DotNetNuke.Security;
+ using Newtonsoft.Json;
///
/// Major class of Taxonomy.
@@ -117,7 +118,8 @@ public Term(string name, string description, int vocabularyId)
}
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public List ChildTerms
{
get
@@ -132,7 +134,8 @@ public List ChildTerms
}
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public bool IsHeirarchical
{
get
@@ -142,7 +145,8 @@ public bool IsHeirarchical
}
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public int Left
{
get
@@ -152,7 +156,8 @@ public int Left
}
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public int Right
{
get
@@ -162,7 +167,8 @@ public int Right
}
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public List Synonyms
{
get
@@ -172,7 +178,8 @@ public List Synonyms
}
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public Vocabulary Vocabulary
{
get
@@ -187,7 +194,8 @@ public Vocabulary Vocabulary
}
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public int VocabularyId
{
get
@@ -197,7 +205,8 @@ public int VocabularyId
}
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public string Description
{
get
@@ -212,7 +221,8 @@ public string Description
}
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public string Name
{
get
@@ -237,7 +247,8 @@ public string Name
}
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public int? ParentTermId
{
get
@@ -252,7 +263,8 @@ public int? ParentTermId
}
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public int TermId
{
get
@@ -267,7 +279,8 @@ public int TermId
}
[XmlIgnore]
- [ScriptIgnore]
+ [ScriptIgnore]
+ [JsonIgnore]
public int Weight
{
get
diff --git a/DNN Platform/Library/Entities/Modules/ModuleInfo.cs b/DNN Platform/Library/Entities/Modules/ModuleInfo.cs
index 047b24f2599..126f8fa3598 100644
--- a/DNN Platform/Library/Entities/Modules/ModuleInfo.cs
+++ b/DNN Platform/Library/Entities/Modules/ModuleInfo.cs
@@ -23,6 +23,7 @@ namespace DotNetNuke.Entities.Modules
using DotNetNuke.Services.Localization;
using DotNetNuke.Services.ModuleCache;
using DotNetNuke.Services.Tokens;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project : DotNetNuke
@@ -97,7 +98,8 @@ public ModuleInfo()
///
/// An Integer.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public DesktopModuleInfo DesktopModule
{
get
@@ -109,7 +111,8 @@ public DesktopModuleInfo DesktopModule
}
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool HideAdminBorder
{
get
@@ -126,7 +129,8 @@ public bool HideAdminBorder
}
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool IsShared
{
get { return this.OwnerPortalID != this.PortalID; }
@@ -149,7 +153,8 @@ public ModuleControlInfo ModuleControl
///
/// A ModuleDefinitionInfo.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public ModuleDefinitionInfo ModuleDefinition
{
get
@@ -161,7 +166,8 @@ public ModuleDefinitionInfo ModuleDefinition
}
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public Hashtable ModuleSettings
{
get
@@ -182,7 +188,8 @@ public Hashtable ModuleSettings
}
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public Hashtable TabModuleSettings
{
get
@@ -203,7 +210,8 @@ public Hashtable TabModuleSettings
}
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public ModuleInfo DefaultLanguageModule
{
get
@@ -249,7 +257,8 @@ public bool IsNeutralCulture
}
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool IsTranslated
{
get
@@ -265,7 +274,8 @@ public bool IsTranslated
}
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public Dictionary LocalizedModules
{
get
@@ -324,7 +334,8 @@ public CacheLevel Cacheability
[XmlElement("alignment")]
public string Alignment { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool AllModules { get; set; }
[XmlElement("alltabs")]
@@ -342,7 +353,8 @@ public CacheLevel Cacheability
[XmlElement("color")]
public string Color { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public string ContainerPath { get; set; }
[XmlElement("containersrc")]
@@ -354,7 +366,8 @@ public CacheLevel Cacheability
///
/// An Integer.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int DesktopModuleID { get; set; }
[XmlElement("displayprint")]
@@ -381,26 +394,31 @@ public CacheLevel Cacheability
[XmlElement("inheritviewpermissions")]
public bool InheritViewPermissions { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool IsDefaultModule { get; set; }
[XmlElement("isdeleted")]
public bool IsDeleted { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool IsShareable { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool IsShareableViewOnly { get; set; }
[Obsolete("WebSlice functionality is no longer used. Will be removed in v10.0.0")]
[XmlElement("iswebslice")]
public bool IsWebSlice { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public DateTime LastContentModifiedOnDate { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int ModuleControlId { get; set; }
/// -----------------------------------------------------------------------------
@@ -409,7 +427,8 @@ public CacheLevel Cacheability
///
/// An Integer.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int ModuleDefID { get; set; }
[XmlElement("moduleorder")]
@@ -443,16 +462,20 @@ public ModulePermissionCollection ModulePermissions
[XmlElement("title")]
public string ModuleTitle { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int ModuleVersion { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int OwnerPortalID { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int PaneModuleCount { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int PaneModuleIndex { get; set; }
[XmlElement("panename")]
@@ -536,7 +559,8 @@ public Guid LocalizedVersionGuid
///
/// An Integer.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public override int KeyID
{
get
diff --git a/DNN Platform/Library/Entities/Modules/PortalDesktopModuleInfo.cs b/DNN Platform/Library/Entities/Modules/PortalDesktopModuleInfo.cs
index f53b478ee95..323c198eaad 100644
--- a/DNN Platform/Library/Entities/Modules/PortalDesktopModuleInfo.cs
+++ b/DNN Platform/Library/Entities/Modules/PortalDesktopModuleInfo.cs
@@ -8,6 +8,7 @@ namespace DotNetNuke.Entities.Modules
using DotNetNuke.Common.Utilities;
using DotNetNuke.Security.Permissions;
+ using Newtonsoft.Json;
[Serializable]
public class PortalDesktopModuleInfo : BaseEntityInfo
@@ -15,7 +16,8 @@ public class PortalDesktopModuleInfo : BaseEntityInfo
private DesktopModuleInfo _desktopModule;
private DesktopModulePermissionCollection _permissions;
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public DesktopModuleInfo DesktopModule
{
get
@@ -42,18 +44,22 @@ public DesktopModulePermissionCollection Permissions
}
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int PortalDesktopModuleID { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int DesktopModuleID { get; set; }
public string FriendlyName { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int PortalID { get; set; }
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public string PortalName { get; set; }
}
}
diff --git a/DNN Platform/Library/Entities/Portals/PortalInfo.cs b/DNN Platform/Library/Entities/Portals/PortalInfo.cs
index bc95fd9112a..14d13a18b7e 100644
--- a/DNN Platform/Library/Entities/Portals/PortalInfo.cs
+++ b/DNN Platform/Library/Entities/Portals/PortalInfo.cs
@@ -15,6 +15,7 @@ namespace DotNetNuke.Entities.Portals
using DotNetNuke.Entities.Tabs;
using DotNetNuke.Entities.Users;
using DotNetNuke.Security.Roles;
+ using Newtonsoft.Json;
///
/// PortalInfo provides a base class for Portal information
@@ -93,6 +94,7 @@ public string HomeSystemDirectory
///
[XmlIgnore]
+ [JsonIgnore]
public string HomeDirectoryMapPath
{
get
@@ -103,6 +105,7 @@ public string HomeDirectoryMapPath
///
[XmlIgnore]
+ [JsonIgnore]
public string HomeSystemDirectoryMapPath
{
get
@@ -173,6 +176,7 @@ public string HomeSystemDirectoryMapPath
///
[XmlIgnore]
+ [JsonIgnore]
public Guid GUID { get; set; }
///
@@ -414,6 +418,7 @@ public string RegisteredRoleName
}
[XmlIgnore]
+ [JsonIgnore]
[Obsolete("Deprecated in DNN 6.0. Scheduled removal in v10.0.0.")]
public int TimeZoneOffset { get; set; }
diff --git a/DNN Platform/Library/Entities/Profile/ProfilePropertyDefinition.cs b/DNN Platform/Library/Entities/Profile/ProfilePropertyDefinition.cs
index 2a8b4c8f3d4..f027b96771c 100644
--- a/DNN Platform/Library/Entities/Profile/ProfilePropertyDefinition.cs
+++ b/DNN Platform/Library/Entities/Profile/ProfilePropertyDefinition.cs
@@ -10,8 +10,9 @@ namespace DotNetNuke.Entities.Profile
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities.Portals;
- using DotNetNuke.Entities.Users;
- using DotNetNuke.UI.WebControls;
+ using DotNetNuke.Entities.Users;
+ using DotNetNuke.UI.WebControls;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project: DotNetNuke
@@ -83,7 +84,8 @@ public ProfilePropertyDefinition(int portalId)
[IsReadOnly(true)]
[Required(true)]
[SortOrder(1)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int DataType
{
get
@@ -108,7 +110,8 @@ public int DataType
///
/// -----------------------------------------------------------------------------
[SortOrder(4)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public string DefaultValue
{
get
@@ -133,7 +136,8 @@ public string DefaultValue
///
/// -----------------------------------------------------------------------------
[SortOrder(10)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public UserVisibilityMode DefaultVisibility
{
get
@@ -158,7 +162,8 @@ public UserVisibilityMode DefaultVisibility
///
/// -----------------------------------------------------------------------------
[Browsable(false)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool Deleted
{
get
@@ -178,7 +183,8 @@ public bool Deleted
///
/// -----------------------------------------------------------------------------
[Browsable(false)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool IsDirty { get; private set; }
/// -----------------------------------------------------------------------------
@@ -212,7 +218,8 @@ public int Length
///
/// -----------------------------------------------------------------------------
[Browsable(false)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int ModuleDefId
{
get
@@ -232,7 +239,8 @@ public int ModuleDefId
///
/// -----------------------------------------------------------------------------
[Browsable(false)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int PortalId
{
get
@@ -278,7 +286,8 @@ public string PropertyCategory
///
/// -----------------------------------------------------------------------------
[Browsable(false)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int PropertyDefinitionId { get; set; }
/// -----------------------------------------------------------------------------
@@ -315,7 +324,8 @@ public string PropertyName
///
/// -----------------------------------------------------------------------------
[Browsable(false)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public string PropertyValue
{
get
@@ -340,7 +350,8 @@ public string PropertyValue
///
/// -----------------------------------------------------------------------------
[SortOrder(7)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool ReadOnly
{
get
@@ -365,7 +376,8 @@ public bool ReadOnly
///
/// -----------------------------------------------------------------------------
[SortOrder(6)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool Required
{
get
@@ -390,7 +402,8 @@ public bool Required
///
/// -----------------------------------------------------------------------------
[SortOrder(5)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public string ValidationExpression
{
get
@@ -416,7 +429,8 @@ public string ValidationExpression
/// -----------------------------------------------------------------------------
[IsReadOnly(true)]
[SortOrder(9)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int ViewOrder
{
get
@@ -441,7 +455,8 @@ public int ViewOrder
///
/// -----------------------------------------------------------------------------
[SortOrder(8)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool Visible
{
get
@@ -466,7 +481,8 @@ public bool Visible
///
/// -----------------------------------------------------------------------------
[Browsable(false)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public ProfileVisibility ProfileVisibility
{
get
@@ -487,7 +503,8 @@ public ProfileVisibility ProfileVisibility
[Obsolete("Deprecated in 6.2 as profile visibility has been extended, keep for compatible with upgrade.. Scheduled removal in v10.0.0.")]
[Browsable(false)]
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public UserVisibilityMode Visibility
{
get
diff --git a/DNN Platform/Library/Entities/Tabs/TabInfo.cs b/DNN Platform/Library/Entities/Tabs/TabInfo.cs
index 9c8d9bf3931..64749f90c5b 100644
--- a/DNN Platform/Library/Entities/Tabs/TabInfo.cs
+++ b/DNN Platform/Library/Entities/Tabs/TabInfo.cs
@@ -30,6 +30,7 @@ namespace DotNetNuke.Entities.Tabs
using DotNetNuke.Services.FileSystem;
using DotNetNuke.Services.Localization;
using DotNetNuke.Services.Tokens;
+ using Newtonsoft.Json;
/// Information about a page within a DNN site.
///
@@ -107,6 +108,7 @@ private TabInfo(SharedDictionary localizedTabNameDictionary, Sha
/// Gets a value indicating whether this page has a version that is visible to the current user.
[XmlIgnore]
+ [JsonIgnore]
public bool HasAVisibleVersion
{
get
@@ -117,6 +119,7 @@ public bool HasAVisibleVersion
/// Gets a value indicating whether DNN's search index should include this page.
[XmlIgnore]
+ [JsonIgnore]
public bool AllowIndex
{
get
@@ -129,6 +132,7 @@ public bool AllowIndex
/// Gets the modules on this page.
/// A mapping between Module ID and .
[XmlIgnore]
+ [JsonIgnore]
public Dictionary ChildModules
{
get
@@ -140,6 +144,7 @@ public Dictionary ChildModules
/// Gets info for the default language version of this page, if it exists.
/// A instance, or null.
[XmlIgnore]
+ [JsonIgnore]
public TabInfo DefaultLanguageTab
{
get
@@ -155,6 +160,7 @@ public TabInfo DefaultLanguageTab
/// Gets a value indicating whether this page is configured not to redirect.
[XmlIgnore]
+ [JsonIgnore]
public bool DoNotRedirect
{
get
@@ -175,6 +181,7 @@ public bool DoNotRedirect
/// Gets the indented name of this page (i.e. with "..." at the beginning based on the page's ).
[XmlIgnore]
+ [JsonIgnore]
public string IndentedTabName
{
get
@@ -192,6 +199,7 @@ public string IndentedTabName
/// Gets a value indicating whether this page is the default language version.
[XmlIgnore]
+ [JsonIgnore]
public bool IsDefaultLanguage
{
get
@@ -202,6 +210,7 @@ public bool IsDefaultLanguage
/// Gets a value indicating whether this page is not for any specific culture/language.
[XmlIgnore]
+ [JsonIgnore]
public bool IsNeutralCulture
{
get
@@ -212,6 +221,7 @@ public bool IsNeutralCulture
/// Gets a value indicating whether this page is translated.
[XmlIgnore]
+ [JsonIgnore]
public bool IsTranslated
{
get
@@ -229,6 +239,7 @@ public bool IsTranslated
/// Gets the name of the page for the current culture.
[XmlIgnore]
+ [JsonIgnore]
public string LocalizedTabName
{
get
@@ -269,6 +280,7 @@ public string LocalizedTabName
/// Gets a collection of pages that are localized children of this page.
/// A mapping from to .
[XmlIgnore]
+ [JsonIgnore]
public Dictionary LocalizedTabs
{
get
@@ -298,6 +310,7 @@ public TabPermissionCollection TabPermissions
/// Gets the settings collection for the page.
[XmlIgnore]
+ [JsonIgnore]
public Hashtable TabSettings
{
get
@@ -309,6 +322,7 @@ public Hashtable TabSettings
/// Gets the for the page.
///
[XmlIgnore]
+ [JsonIgnore]
public TabType TabType
{
get
@@ -319,6 +333,7 @@ public TabType TabType
/// Gets a collection of for this page.
[XmlIgnore]
+ [JsonIgnore]
public List AliasSkins
{
get
@@ -330,6 +345,7 @@ public List AliasSkins
/// Gets a collection of custom aliases for this page.
/// A mapping from to HTTP Alias.
[XmlIgnore]
+ [JsonIgnore]
public Dictionary CustomAliases
{
get
@@ -340,6 +356,7 @@ public Dictionary CustomAliases
/// Gets the full URL for this page.
[XmlIgnore]
+ [JsonIgnore]
public string FullUrl
{
get
@@ -394,6 +411,7 @@ public string FullUrl
/// Gets a value indicating whether the tab permissions are specified.
[Obsolete("Deprecated in DNN 9.7.0, as this provides no use and always returns false. Scheduled removal in v11.0.0.")]
[XmlIgnore]
+ [JsonIgnore]
public bool TabPermissionsSpecified
{
get { return false; }
@@ -401,6 +419,7 @@ public bool TabPermissionsSpecified
/// Gets a collection of page-specific URLs.
[XmlIgnore]
+ [JsonIgnore]
public List TabUrls
{
get
@@ -421,10 +440,12 @@ public CacheLevel Cacheability
/// Gets or sets the collection of bread crumb pages (i.e. the parent, grandparent, etc. of this page).
/// An with instances.
[XmlIgnore]
+ [JsonIgnore]
public ArrayList BreadCrumbs { get; set; }
/// Gets or sets the path to the directory with .
[XmlIgnore]
+ [JsonIgnore]
public string ContainerPath { get; set; }
/// Gets or sets the path to the default container for this page, if there is one.
@@ -457,10 +478,12 @@ public CacheLevel Cacheability
/// Gets the icon file URL, as it is stored in the database.
[XmlIgnore]
+ [JsonIgnore]
public string IconFileRaw { get; private set; }
/// Gets the large icon file URL, as it is stored in the database.
[XmlIgnore]
+ [JsonIgnore]
public string IconFileLargeRaw { get; private set; }
/// Gets or sets a value indicating whether this page is deleted.
@@ -481,6 +504,7 @@ public CacheLevel Cacheability
/// Gets or sets a value indicating whether this page has been published.
[XmlIgnore]
+ [JsonIgnore]
public bool HasBeenPublished { get; set; }
/// Gets or sets the meta keywords for the page.
@@ -489,6 +513,7 @@ public CacheLevel Cacheability
/// Gets or sets the level of the page, i.e. how may ancestors (parent, grandparent, etc.) it has.
[XmlIgnore]
+ [JsonIgnore]
public int Level { get; set; }
/// Gets or sets the for the localized version.
@@ -498,6 +523,7 @@ public CacheLevel Cacheability
/// Gets or sets a collection of the modules on this page.
/// An of .
[XmlIgnore]
+ [JsonIgnore]
public ArrayList Modules
{
get
@@ -518,6 +544,7 @@ public ArrayList Modules
/// Gets a list of the names of the panes available to the page.
/// An of values with the IDs of the panes on the page.
[XmlIgnore]
+ [JsonIgnore]
public ArrayList Panes { get; private set; }
/// Gets or sets the ID of this page's parent page (or if it has no parent).
@@ -543,6 +570,7 @@ public ArrayList Modules
/// Gets or sets the path to the directory with .
[XmlIgnore]
+ [JsonIgnore]
public string SkinPath { get; set; }
/// Gets or sets the path to the skin control for this page.
@@ -613,6 +641,7 @@ public string IconFileLarge
/// Gets or sets a value indicating whether this page is a host level page that doesn't belong to any portal.
[XmlIgnore]
+ [JsonIgnore]
public bool IsSuperTab
{
get
@@ -634,6 +663,7 @@ public bool IsSuperTab
///
[XmlIgnore]
+ [JsonIgnore]
public override int KeyID
{
get
@@ -677,6 +707,7 @@ public string SkinDoctype
/// Gets or sets a value indicating whether this page uses friendly URLs.
[XmlIgnore]
+ [JsonIgnore]
public bool UseBaseFriendlyUrls { get; set; }
///
diff --git a/DNN Platform/Library/Entities/Users/Profile/UserProfile.cs b/DNN Platform/Library/Entities/Users/Profile/UserProfile.cs
index ce4a6f5b6a3..bf6b9506b3d 100644
--- a/DNN Platform/Library/Entities/Users/Profile/UserProfile.cs
+++ b/DNN Platform/Library/Entities/Users/Profile/UserProfile.cs
@@ -19,6 +19,7 @@ namespace DotNetNuke.Entities.Users
using DotNetNuke.Entities.Portals;
using DotNetNuke.Entities.Profile;
using DotNetNuke.Services.FileSystem;
+ using Newtonsoft.Json;
///
/// The UserProfile class provides a Business Layer entity for the Users Profile.
@@ -410,6 +411,7 @@ public string PreferredLocale
/// Gets or sets the preferred time zone.
///
[XmlIgnore]
+ [JsonIgnore]
public TimeZoneInfo PreferredTimeZone
{
get
diff --git a/DNN Platform/Library/Entities/Users/Social/Relationship.cs b/DNN Platform/Library/Entities/Users/Social/Relationship.cs
index ff0ad3e2583..012de969db6 100644
--- a/DNN Platform/Library/Entities/Users/Social/Relationship.cs
+++ b/DNN Platform/Library/Entities/Users/Social/Relationship.cs
@@ -8,8 +8,9 @@ namespace DotNetNuke.Entities.Users.Social
using System.Xml.Serialization;
using DotNetNuke.Common.Utilities;
- using DotNetNuke.Entities;
- using DotNetNuke.Entities.Modules;
+ using DotNetNuke.Entities;
+ using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project: DotNetNuke
@@ -38,7 +39,8 @@ public Relationship()
///
/// Gets a value indicating whether is this a Portal-Level Relationship.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool IsPortalList
{
get
@@ -50,7 +52,8 @@ public bool IsPortalList
///
/// Gets a value indicating whether is this a Host-Level Relationship (very uncommon).
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool IsHostList
{
get
@@ -62,7 +65,8 @@ public bool IsHostList
///
/// Gets a value indicating whether is this a USer-Level Relationship.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool IsUserList
{
get
@@ -116,7 +120,8 @@ public bool IsUserList
///
/// Gets or sets iHydratable.KeyID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Entities/Users/Social/RelationshipType.cs b/DNN Platform/Library/Entities/Users/Social/RelationshipType.cs
index a4552eae525..b2e2b094602 100644
--- a/DNN Platform/Library/Entities/Users/Social/RelationshipType.cs
+++ b/DNN Platform/Library/Entities/Users/Social/RelationshipType.cs
@@ -8,6 +8,7 @@ namespace DotNetNuke.Entities.Users
using System.Xml.Serialization;
using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project: DotNetNuke
@@ -61,7 +62,8 @@ public int RelationshipTypeId
///
/// Gets or sets iHydratable.KeyID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Entities/Users/Social/UserRelationship.cs b/DNN Platform/Library/Entities/Users/Social/UserRelationship.cs
index 02e7cc0937b..d9cb70695e7 100644
--- a/DNN Platform/Library/Entities/Users/Social/UserRelationship.cs
+++ b/DNN Platform/Library/Entities/Users/Social/UserRelationship.cs
@@ -8,6 +8,7 @@ namespace DotNetNuke.Entities.Users.Social
using System.Xml.Serialization;
using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project: DotNetNuke
@@ -65,7 +66,8 @@ public UserRelationship()
///
/// Gets or sets iHydratable.KeyID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Entities/Users/Social/UserRelationshipPreference.cs b/DNN Platform/Library/Entities/Users/Social/UserRelationshipPreference.cs
index 00ca794e198..7639fdf777f 100644
--- a/DNN Platform/Library/Entities/Users/Social/UserRelationshipPreference.cs
+++ b/DNN Platform/Library/Entities/Users/Social/UserRelationshipPreference.cs
@@ -5,9 +5,9 @@ namespace DotNetNuke.Entities.Users.Social
{
using System;
using System.Data;
- using System.Xml.Serialization;
-
- using DotNetNuke.Entities.Modules;
+ using System.Xml.Serialization;
+ using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project: DotNetNuke
@@ -57,7 +57,8 @@ public UserRelationshipPreference()
///
/// Gets or sets iHydratable.KeyID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Security/Permissions/FolderPermissionInfo.cs b/DNN Platform/Library/Security/Permissions/FolderPermissionInfo.cs
index 09159cc5382..0cd2bbd584f 100644
--- a/DNN Platform/Library/Security/Permissions/FolderPermissionInfo.cs
+++ b/DNN Platform/Library/Security/Permissions/FolderPermissionInfo.cs
@@ -9,6 +9,7 @@ namespace DotNetNuke.Security.Permissions
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
[Serializable]
public class FolderPermissionInfo : PermissionInfoBase, IHydratable
@@ -50,7 +51,8 @@ public FolderPermissionInfo(PermissionInfo permission)
this.PermissionName = permission.PermissionName;
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int FolderPermissionID
{
get
@@ -64,7 +66,8 @@ public int FolderPermissionID
}
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int FolderID
{
get
@@ -78,7 +81,8 @@ public int FolderID
}
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int PortalID
{
get
@@ -112,7 +116,8 @@ public string FolderPath
///
/// An Integer.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Security/Permissions/ModulePermissionInfo.cs b/DNN Platform/Library/Security/Permissions/ModulePermissionInfo.cs
index 83a3754a246..386a1a7af58 100644
--- a/DNN Platform/Library/Security/Permissions/ModulePermissionInfo.cs
+++ b/DNN Platform/Library/Security/Permissions/ModulePermissionInfo.cs
@@ -9,6 +9,7 @@ namespace DotNetNuke.Security.Permissions
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project : DotNetNuke
@@ -102,7 +103,8 @@ public int ModuleID
///
/// An Integer.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Security/Permissions/PermissionInfo.cs b/DNN Platform/Library/Security/Permissions/PermissionInfo.cs
index c067d7e0866..16f18324f57 100644
--- a/DNN Platform/Library/Security/Permissions/PermissionInfo.cs
+++ b/DNN Platform/Library/Security/Permissions/PermissionInfo.cs
@@ -9,6 +9,7 @@ namespace DotNetNuke.Security.Permissions
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project : DotNetNuke
@@ -28,7 +29,8 @@ public class PermissionInfo : BaseEntityInfo
///
/// An Integer.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int ModuleDefID { get; set; }
/// -----------------------------------------------------------------------------
@@ -64,7 +66,8 @@ public class PermissionInfo : BaseEntityInfo
///
/// A String.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public string PermissionName { get; set; }
/// -----------------------------------------------------------------------------
diff --git a/DNN Platform/Library/Security/Permissions/TabPermissionInfo.cs b/DNN Platform/Library/Security/Permissions/TabPermissionInfo.cs
index 14cb7854352..f6718751c6b 100644
--- a/DNN Platform/Library/Security/Permissions/TabPermissionInfo.cs
+++ b/DNN Platform/Library/Security/Permissions/TabPermissionInfo.cs
@@ -9,6 +9,7 @@ namespace DotNetNuke.Security.Permissions
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project : DotNetNuke
@@ -103,7 +104,8 @@ public int TabID
///
/// An Integer.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Security/Roles/RoleInfo.cs b/DNN Platform/Library/Security/Roles/RoleInfo.cs
index ec27b163ba7..5f2a2a5476b 100644
--- a/DNN Platform/Library/Security/Roles/RoleInfo.cs
+++ b/DNN Platform/Library/Security/Roles/RoleInfo.cs
@@ -18,18 +18,19 @@ namespace DotNetNuke.Security.Roles
using DotNetNuke.Entities.Modules;
using DotNetNuke.Entities.Portals;
using DotNetNuke.Entities.Users;
- using DotNetNuke.Services.FileSystem;
- using DotNetNuke.Services.Tokens;
+ using DotNetNuke.Services.FileSystem;
+ using DotNetNuke.Services.Tokens;
+using Newtonsoft.Json;
- /// -----------------------------------------------------------------------------
- /// Project: DotNetNuke
- /// Namespace: DotNetNuke.Security.Roles
- /// Class: RoleInfo
- /// -----------------------------------------------------------------------------
- ///
- /// The RoleInfo class provides the Entity Layer Role object.
- ///
- /// -----------------------------------------------------------------------------
+/// -----------------------------------------------------------------------------
+/// Project: DotNetNuke
+/// Namespace: DotNetNuke.Security.Roles
+/// Class: RoleInfo
+/// -----------------------------------------------------------------------------
+///
+/// The RoleInfo class provides the Entity Layer Role object.
+///
+/// -----------------------------------------------------------------------------
[Serializable]
public class RoleInfo : BaseEntityInfo, IHydratable, IXmlSerializable, IPropertyAccess
{
@@ -73,7 +74,8 @@ public RoleType RoleType
/// Gets the role settings.
///
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public Dictionary Settings
{
get
@@ -183,7 +185,8 @@ public CacheLevel Cacheability
///
/// An Integer representing the Id of the Portal.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int PortalID { get; set; }
/// -----------------------------------------------------------------------------
@@ -192,7 +195,8 @@ public CacheLevel Cacheability
///
/// An Integer representing the Id of the Role.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int RoleID { get; set; }
/// -----------------------------------------------------------------------------
@@ -201,7 +205,8 @@ public CacheLevel Cacheability
///
/// An Integer representing the Id of the RoleGroup.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int RoleGroupID { get; set; }
/// -----------------------------------------------------------------------------
diff --git a/DNN Platform/Library/Services/Exceptions/BasePortalException.cs b/DNN Platform/Library/Services/Exceptions/BasePortalException.cs
index 84db4e631b0..67d9edf72e2 100644
--- a/DNN Platform/Library/Services/Exceptions/BasePortalException.cs
+++ b/DNN Platform/Library/Services/Exceptions/BasePortalException.cs
@@ -14,6 +14,7 @@ namespace DotNetNuke.Services.Exceptions
using DotNetNuke.Entities.Users;
using DotNetNuke.Framework.Providers;
using DotNetNuke.Instrumentation;
+ using Newtonsoft.Json;
///
/// Base Portal Exception.
@@ -89,7 +90,8 @@ protected BasePortalException(SerializationInfo info, StreamingContext context)
this.m_Source = info.GetString("m_Source");
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public new MethodBase TargetSite
{
get
diff --git a/DNN Platform/Library/Services/FileSystem/FileInfo.cs b/DNN Platform/Library/Services/FileSystem/FileInfo.cs
index 3104cabd3fa..9e4e8bd1ca7 100644
--- a/DNN Platform/Library/Services/FileSystem/FileInfo.cs
+++ b/DNN Platform/Library/Services/FileSystem/FileInfo.cs
@@ -16,6 +16,7 @@ namespace DotNetNuke.Services.FileSystem
using DotNetNuke.Entities.Modules;
using DotNetNuke.Entities.Portals;
using DotNetNuke.Instrumentation;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project : DotNetNuke
@@ -306,7 +307,8 @@ public string Folder
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int PortalId { get; set; }
///
@@ -460,7 +462,8 @@ public int FolderMappingID
///
/// Gets a value indicating whether gets a flag which says whether the file has ever been published.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool HasBeenPublished { get; private set; }
///
@@ -469,7 +472,8 @@ public int FolderMappingID
public int ContentItemID { get; set; }
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Services/FileSystem/FolderInfo.cs b/DNN Platform/Library/Services/FileSystem/FolderInfo.cs
index cec53ba43ff..6f5d8b6a252 100644
--- a/DNN Platform/Library/Services/FileSystem/FolderInfo.cs
+++ b/DNN Platform/Library/Services/FileSystem/FolderInfo.cs
@@ -15,6 +15,7 @@ namespace DotNetNuke.Services.FileSystem
using DotNetNuke.Entities.Modules;
using DotNetNuke.Entities.Portals;
using DotNetNuke.Security.Permissions;
+ using Newtonsoft.Json;
[XmlRoot("folder", IsNullable = false)]
[Serializable]
@@ -274,7 +275,8 @@ public string DisplayPath
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public DateTime LastUpdated { get; set; }
@@ -317,7 +319,8 @@ public int FolderMappingID
///
/// An Integer.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Services/Installer/Packages/PackageInfo.cs b/DNN Platform/Library/Services/Installer/Packages/PackageInfo.cs
index 74558c4a908..b322f6ddafa 100644
--- a/DNN Platform/Library/Services/Installer/Packages/PackageInfo.cs
+++ b/DNN Platform/Library/Services/Installer/Packages/PackageInfo.cs
@@ -10,13 +10,12 @@ namespace DotNetNuke.Services.Installer.Packages
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities;
using DotNetNuke.Services.Installer.Log;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
///
/// The PackageInfo class represents a single Installer Package.
///
- ///
- ///
/// -----------------------------------------------------------------------------
[Serializable]
public class PackageInfo : BaseEntityInfo
@@ -51,7 +50,8 @@ public PackageInfo()
}
/// Gets the direct dependencies of this package.
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public IList Dependencies
{
get
@@ -68,7 +68,8 @@ public IList Dependencies
///
/// A Dictionary(Of String, InstallFile).
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public Dictionary Files
{
get
@@ -97,7 +98,8 @@ public InstallMode InstallMode
///
/// An Logger object.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public Logger Log
{
get
@@ -168,7 +170,8 @@ public Logger Log
///
/// An InstallerInfo object.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public InstallerInfo InstallerInfo { get; private set; }
/// -----------------------------------------------------------------------------
@@ -185,7 +188,8 @@ public Logger Log
///
/// A Boolean value.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public bool IsValid { get; private set; }
/// -----------------------------------------------------------------------------
diff --git a/DNN Platform/Library/Services/Journal/JournalItem.cs b/DNN Platform/Library/Services/Journal/JournalItem.cs
index 1913e2a5fbe..2909631305c 100644
--- a/DNN Platform/Library/Services/Journal/JournalItem.cs
+++ b/DNN Platform/Library/Services/Journal/JournalItem.cs
@@ -11,6 +11,7 @@ namespace DotNetNuke.Services.Journal
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities.Modules;
using DotNetNuke.Services.Tokens;
+ using Newtonsoft.Json;
public class JournalItem : IHydratable, IPropertyAccess
{
@@ -84,7 +85,8 @@ public CacheLevel Cacheability
///
/// If you derive class has its own key id, please override this property and set the value to your own key id.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public virtual int KeyID
{
get
diff --git a/DNN Platform/Library/Services/Mobile/PreviewProfile.cs b/DNN Platform/Library/Services/Mobile/PreviewProfile.cs
index dcc2a808ec8..e4e73a84035 100644
--- a/DNN Platform/Library/Services/Mobile/PreviewProfile.cs
+++ b/DNN Platform/Library/Services/Mobile/PreviewProfile.cs
@@ -8,6 +8,7 @@ namespace DotNetNuke.Services.Mobile
using System.Xml.Serialization;
using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
[Serializable]
public class PreviewProfile : IPreviewProfile, IHydratable
@@ -78,7 +79,8 @@ public string Name
///
/// Gets or sets iHydratable.KeyID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Services/Mobile/Redirection.cs b/DNN Platform/Library/Services/Mobile/Redirection.cs
index 7fbb597b044..a40144a4c56 100644
--- a/DNN Platform/Library/Services/Mobile/Redirection.cs
+++ b/DNN Platform/Library/Services/Mobile/Redirection.cs
@@ -11,13 +11,15 @@ namespace DotNetNuke.Services.Mobile
using DotNetNuke.Common.Utilities;
using DotNetNuke.Data;
using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
[Serializable]
public class Redirection : IRedirection, IHydratable
{
private int _id = -1;
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
private IList _matchRules;
///
@@ -72,7 +74,8 @@ public int Id
///
/// Gets or sets when redirection type is RedirectionType.Other, should use this collection to match the request by capability info.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public IList MatchRules
{
get
@@ -131,7 +134,8 @@ public IList MatchRules
///
/// Gets or sets iHydratable.KeyID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Services/Social/Messaging/Message.cs b/DNN Platform/Library/Services/Social/Messaging/Message.cs
index 996ea9e8fd4..4886cdce518 100644
--- a/DNN Platform/Library/Services/Social/Messaging/Message.cs
+++ b/DNN Platform/Library/Services/Social/Messaging/Message.cs
@@ -10,6 +10,7 @@ namespace DotNetNuke.Services.Social.Messaging
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities;
using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project: DotNetNuke
@@ -118,7 +119,8 @@ public int MessageID
///
/// Gets or sets iHydratable.KeyID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Services/Social/Messaging/MessageAttachment.cs b/DNN Platform/Library/Services/Social/Messaging/MessageAttachment.cs
index 49a3e854449..66ec6351b56 100644
--- a/DNN Platform/Library/Services/Social/Messaging/MessageAttachment.cs
+++ b/DNN Platform/Library/Services/Social/Messaging/MessageAttachment.cs
@@ -9,6 +9,7 @@ namespace DotNetNuke.Services.Social.Messaging
using DotNetNuke.Entities;
using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project: DotNetNuke
@@ -56,7 +57,8 @@ public int MessageAttachmentID
///
/// Gets or sets iHydratable.KeyID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Services/Social/Messaging/MessageRecipient.cs b/DNN Platform/Library/Services/Social/Messaging/MessageRecipient.cs
index 045726ef9ce..4a4a33a06fe 100644
--- a/DNN Platform/Library/Services/Social/Messaging/MessageRecipient.cs
+++ b/DNN Platform/Library/Services/Social/Messaging/MessageRecipient.cs
@@ -10,6 +10,7 @@ namespace DotNetNuke.Services.Social.Messaging
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities;
using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project: DotNetNuke
@@ -69,7 +70,8 @@ public int RecipientID
///
/// Gets or sets iHydratable.KeyID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Services/Social/Notifications/Notification.cs b/DNN Platform/Library/Services/Social/Notifications/Notification.cs
index 66d6e259d93..f9cadeb11e9 100644
--- a/DNN Platform/Library/Services/Social/Notifications/Notification.cs
+++ b/DNN Platform/Library/Services/Social/Notifications/Notification.cs
@@ -9,8 +9,9 @@ namespace DotNetNuke.Services.Social.Notifications
using System.Xml.Serialization;
using DotNetNuke.Common.Utilities;
- using DotNetNuke.Entities;
- using DotNetNuke.Entities.Modules;
+ using DotNetNuke.Entities;
+ using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project: DotNetNuke
@@ -121,7 +122,8 @@ public int NotificationID
///
/// Gets or sets iHydratable.KeyID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/DNN Platform/Library/Services/Social/Notifications/NotificationType.cs b/DNN Platform/Library/Services/Social/Notifications/NotificationType.cs
index 7c8f4120e8c..c3dc5068592 100644
--- a/DNN Platform/Library/Services/Social/Notifications/NotificationType.cs
+++ b/DNN Platform/Library/Services/Social/Notifications/NotificationType.cs
@@ -9,8 +9,9 @@ namespace DotNetNuke.Services.Social.Notifications
using System.Xml.Serialization;
using DotNetNuke.Common.Utilities;
- using DotNetNuke.Entities;
- using DotNetNuke.Entities.Modules;
+ using DotNetNuke.Entities;
+ using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project: DotNetNuke
@@ -98,7 +99,8 @@ public int DesktopModuleId
///
/// Gets or sets iHydratable.KeyID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get { return this.NotificationTypeId; }
diff --git a/DNN Platform/Library/Services/Social/Notifications/NotificationTypeAction.cs b/DNN Platform/Library/Services/Social/Notifications/NotificationTypeAction.cs
index e5b2892e592..5e4ac10954c 100644
--- a/DNN Platform/Library/Services/Social/Notifications/NotificationTypeAction.cs
+++ b/DNN Platform/Library/Services/Social/Notifications/NotificationTypeAction.cs
@@ -9,8 +9,9 @@ namespace DotNetNuke.Services.Social.Notifications
using System.Xml.Serialization;
using DotNetNuke.Common.Utilities;
- using DotNetNuke.Entities;
- using DotNetNuke.Entities.Modules;
+ using DotNetNuke.Entities;
+ using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project: DotNetNuke
@@ -82,7 +83,8 @@ public int NotificationTypeActionId
///
/// Gets or sets iHydratable.KeyID.
///
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get { return this.NotificationTypeActionId; }
diff --git a/DNN Platform/Library/UI/Skins/SkinPackageInfo.cs b/DNN Platform/Library/UI/Skins/SkinPackageInfo.cs
index 108100b0537..a6434307e67 100644
--- a/DNN Platform/Library/UI/Skins/SkinPackageInfo.cs
+++ b/DNN Platform/Library/UI/Skins/SkinPackageInfo.cs
@@ -11,6 +11,7 @@ namespace DotNetNuke.UI.Skins
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities;
using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project : DotNetNuke
@@ -85,7 +86,8 @@ public string SkinName
}
}
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public Dictionary Skins
{
get
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Model/MenuPermissionInfo.cs b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Model/MenuPermissionInfo.cs
index d21b20efe63..8f8cecb4dae 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Model/MenuPermissionInfo.cs
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Model/MenuPermissionInfo.cs
@@ -10,6 +10,7 @@ namespace Dnn.PersonaBar.Library.Model
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities.Modules;
using DotNetNuke.Security.Permissions;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project : DotNetNuke
@@ -106,7 +107,8 @@ public int MenuId
///
/// An Integer.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Model/PermissionInfo.cs b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Model/PermissionInfo.cs
index 59598c3b638..201840a13c9 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Model/PermissionInfo.cs
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Model/PermissionInfo.cs
@@ -10,6 +10,7 @@ namespace Dnn.PersonaBar.Library.Model
using DotNetNuke.Common.Utilities;
using DotNetNuke.Entities;
using DotNetNuke.Entities.Modules;
+ using Newtonsoft.Json;
/// -----------------------------------------------------------------------------
/// Project : DotNetNuke
@@ -41,7 +42,8 @@ public class PermissionInfo : BaseEntityInfo, IHydratable
///
/// An Integer.
/// -----------------------------------------------------------------------------
- [XmlIgnore]
+ [XmlIgnore]
+ [JsonIgnore]
public int KeyID
{
get