Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed an issue with import/export of multiple entities #5930

Merged
merged 1 commit into from
Feb 20, 2024
Merged

Fixed an issue with import/export of multiple entities #5930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions DNN Platform/Library/Common/Utilities/XmlExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,23 @@ public static XmlNode AddAttribute(this XmlNode node, string attributeName, stri
newAttribute.InnerText = attributeValue;
node.Attributes.Append(newAttribute);
return node;
}

/// <summary>
/// Remove the child node with the provided name.
/// </summary>
/// <param name="node">The parent node.</param>
/// <param name="childNodeName">The child node name.</param>
public static void RemoveChildNode(this XmlNode node, string childNodeName)
{
if (node != null)
{
var childNode = node.SelectSingleNode(childNodeName);
if (childNode != null)
{
node.RemoveChild(childNode);
}
}
}
}
}
32 changes: 16 additions & 16 deletions DNN Platform/Library/Entities/Modules/ModuleController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,15 @@ public static XmlNode SerializeModule(XmlDocument xmlModule, ModuleInfo module,
}

// remove unwanted elements
moduleNode.RemoveChild(moduleNode.SelectSingleNode("portalid"));
moduleNode.RemoveChild(moduleNode.SelectSingleNode("tabid"));
moduleNode.RemoveChild(moduleNode.SelectSingleNode("tabmoduleid"));
moduleNode.RemoveChild(moduleNode.SelectSingleNode("moduleorder"));
moduleNode.RemoveChild(moduleNode.SelectSingleNode("panename"));
moduleNode.RemoveChild(moduleNode.SelectSingleNode("isdeleted"));
moduleNode.RemoveChild(moduleNode.SelectSingleNode("versionGuid"));
moduleNode.RemoveChild(moduleNode.SelectSingleNode("localizedVersionGuid"));
moduleNode.RemoveChild(moduleNode.SelectSingleNode("content"));
moduleNode.RemoveChildNode("portalid");
moduleNode.RemoveChildNode("tabid");
moduleNode.RemoveChildNode("tabmoduleid");
moduleNode.RemoveChildNode("moduleorder");
moduleNode.RemoveChildNode("panename");
moduleNode.RemoveChildNode("isdeleted");
moduleNode.RemoveChildNode("versionGuid");
moduleNode.RemoveChildNode("localizedVersionGuid");
moduleNode.RemoveChildNode("content");

// support for localized templates
// moduleNode.RemoveChild(moduleNode.SelectSingleNode("uniqueId"));
Expand All @@ -268,13 +268,13 @@ public static XmlNode SerializeModule(XmlDocument xmlModule, ModuleInfo module,
{
foreach (XmlNode nodePermission in xmlNodeList)
{
nodePermission.RemoveChild(nodePermission.SelectSingleNode("modulepermissionid"));
nodePermission.RemoveChild(nodePermission.SelectSingleNode("permissionid"));
nodePermission.RemoveChild(nodePermission.SelectSingleNode("moduleid"));
nodePermission.RemoveChild(nodePermission.SelectSingleNode("roleid"));
nodePermission.RemoveChild(nodePermission.SelectSingleNode("userid"));
nodePermission.RemoveChild(nodePermission.SelectSingleNode("username"));
nodePermission.RemoveChild(nodePermission.SelectSingleNode("displayname"));
nodePermission.RemoveChildNode("modulepermissionid");
nodePermission.RemoveChildNode("permissionid");
nodePermission.RemoveChildNode("moduleid");
nodePermission.RemoveChildNode("roleid");
nodePermission.RemoveChildNode("userid");
nodePermission.RemoveChildNode("username");
nodePermission.RemoveChildNode("displayname");
}
}

Expand Down
40 changes: 20 additions & 20 deletions DNN Platform/Library/Entities/Tabs/TabController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,19 +679,19 @@ public static XmlNode SerializeTab(XmlDocument tabXml, Hashtable tabs, TabInfo t

// remove unwanted elements
// ReSharper disable AssignNullToNotNullAttribute
tabNode.RemoveChild(tabNode.SelectSingleNode("tabid"));
tabNode.RemoveChild(tabNode.SelectSingleNode("moduleID"));
tabNode.RemoveChild(tabNode.SelectSingleNode("taborder"));
tabNode.RemoveChild(tabNode.SelectSingleNode("portalid"));
tabNode.RemoveChild(tabNode.SelectSingleNode("parentid"));
tabNode.RemoveChild(tabNode.SelectSingleNode("isdeleted"));
tabNode.RemoveChild(tabNode.SelectSingleNode("tabpath"));
tabNode.RemoveChild(tabNode.SelectSingleNode("haschildren"));
tabNode.RemoveChild(tabNode.SelectSingleNode("skindoctype"));
tabNode.RemoveChild(tabNode.SelectSingleNode("uniqueid"));
tabNode.RemoveChild(tabNode.SelectSingleNode("versionguid"));
tabNode.RemoveChild(tabNode.SelectSingleNode("defaultLanguageGuid"));
tabNode.RemoveChild(tabNode.SelectSingleNode("localizedVersionGuid"));
tabNode.RemoveChildNode("tabid");
tabNode.RemoveChildNode("moduleID");
tabNode.RemoveChildNode("taborder");
tabNode.RemoveChildNode("portalid");
tabNode.RemoveChildNode("parentid");
tabNode.RemoveChildNode("isdeleted");
tabNode.RemoveChildNode("tabpath");
tabNode.RemoveChildNode("haschildren");
tabNode.RemoveChildNode("skindoctype");
tabNode.RemoveChildNode("uniqueid");
tabNode.RemoveChildNode("versionguid");
tabNode.RemoveChildNode("defaultLanguageGuid");
tabNode.RemoveChildNode("localizedVersionGuid");
XmlNodeList xmlNodeList = tabNode.SelectNodes("tabpermissions/permission");
if (xmlNodeList != null && xmlNodeList.Count == 0)
{
Expand Down Expand Up @@ -723,13 +723,13 @@ public static XmlNode SerializeTab(XmlDocument tabXml, Hashtable tabs, TabInfo t
{
foreach (XmlNode nodePermission in xmlNodeList)
{
nodePermission.RemoveChild(nodePermission.SelectSingleNode("tabpermissionid"));
nodePermission.RemoveChild(nodePermission.SelectSingleNode("permissionid"));
nodePermission.RemoveChild(nodePermission.SelectSingleNode("tabid"));
nodePermission.RemoveChild(nodePermission.SelectSingleNode("roleid"));
nodePermission.RemoveChild(nodePermission.SelectSingleNode("userid"));
nodePermission.RemoveChild(nodePermission.SelectSingleNode("username"));
nodePermission.RemoveChild(nodePermission.SelectSingleNode("displayname"));
nodePermission.RemoveChildNode("tabpermissionid");
nodePermission.RemoveChildNode("permissionid");
nodePermission.RemoveChildNode("tabid");
nodePermission.RemoveChildNode("roleid");
nodePermission.RemoveChildNode("userid");
nodePermission.RemoveChildNode("username");
nodePermission.RemoveChildNode("displayname");
}
}

Expand Down