Skip to content

Save as file - include layout #1168

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

Open
maeg02 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Save as file - include layout #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df1419e
Save both fetch xml and layout xml
maeg02 Jan 19, 2026
047b4e1
Merge branch 'rappen:master' into master
maeg02 Jan 19, 2026
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
12 changes: 7 additions & 5 deletions FetchXmlBuilder/DockControls/TreeBuilderControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ internal void RestoreHistoryPosition(int delta)
internal void Save(string fileName)
{
BuildAndValidateXml();
var fetchDoc = GetFetchDocument();
var fetchDoc = GetFetchDocument(true);
fetchDoc.Save(fileName);
ClearChanged();
}
Expand Down Expand Up @@ -599,11 +599,13 @@ private XmlDocument GetFetchDocument(bool includelayout = false)
doc.AppendChild(rootNode);
if (includelayout && LayoutXML != null)
{
//rootNode.AppendChild(new XmlNode("view"));
//view.AppendChild(LayoutXML.ToXMLString().ToXmlNode());
//view.AppendChild(GetFetchDocument(false));
TreeNodeHelper.AddXmlNode(tvFetch.Nodes[0], rootNode);
var view = doc.CreateElement("view");
view.InnerXml = LayoutXML.ToXMLString();
doc.DocumentElement.AppendChild(view);

TreeNodeHelper.AddXmlNode(tvFetch.Nodes[0], view);
var xmlbody = doc.SelectSingleNode("root/view").OuterXml;

doc.LoadXml(xmlbody);
}
else
Expand Down
4 changes: 2 additions & 2 deletions FetchXmlBuilder/FXBGui.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,8 @@ private void OpenFile()
break;

case "view":
var fetch = fetchDoc.SelectSingleNode("//fetch")?.InnerText;
var layout = fetchDoc.SelectSingleNode("//grid")?.InnerText;
var fetch = fetchDoc.SelectSingleNode("//fetch")?.OuterXml;
var layout = fetchDoc.SelectSingleNode("//grid")?.OuterXml;
dockControlBuilder.Init(fetch, layout, true, "open file", true);
break;

Expand Down