lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#20267: Preventing QueryPartDriver from inadvertently modifying state while exporting

Browse Source 
Work Item: 20267
This commit is contained in:
Stanley Goldman
2013-11-07 11:54:40 -05:00
committed by Sebastien Ros
parent 299e9ff946
commit 0c6dc4c41c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Orchard.Web/Modules/Orchard.Projections/Drivers/QueryPartDriver.cs
View File

@@ -39,15 +39,16 @@ namespace Orchard.Projections.Drivers {
var descriptor = _projectionManager.GetFilter(filter.Category, filter.Type);
var state = filter.State;
if (descriptor != null) {
filter.State = _formManager.Export(descriptor.Form, filter.State, context);
state = _formManager.Export(descriptor.Form, filter.State, context);
}
return new XElement("Filter",
new XAttribute("Category", filter.Category ?? ""),
new XAttribute("Description", filter.Description ?? ""),
new XAttribute("Position", filter.Position),
new XAttribute("State", filter.State ?? ""),
new XAttribute("State", state ?? ""),
new XAttribute("Type", filter.Type ?? "")
);
})
@@ -58,15 +59,16 @@ namespace Orchard.Projections.Drivers {
part.SortCriteria.Select(sortCriterion => {
var descriptor = _projectionManager.GetFilter(sortCriterion.Category, sortCriterion.Type);
var state = sortCriterion.State;
if (descriptor != null) {
sortCriterion.State = _formManager.Export(descriptor.Form, sortCriterion.State, context);
state = _formManager.Export(descriptor.Form, sortCriterion.State, context);
}
return new XElement("SortCriterion",
new XAttribute("Category", sortCriterion.Category ?? ""),
new XAttribute("Description", sortCriterion.Description ?? ""),
new XAttribute("Position", sortCriterion.Position),
new XAttribute("State", sortCriterion.State ?? ""),
new XAttribute("State", state ?? ""),
new XAttribute("Type", sortCriterion.Type ?? "")
);
})
@@ -75,15 +77,16 @@ namespace Orchard.Projections.Drivers {
part.Layouts.Select(layout => {
var descriptor = _projectionManager.GetFilter(layout.Category, layout.Type);
var state = layout.State;
if (descriptor != null) {
layout.State = _formManager.Export(descriptor.Form, layout.State, context);
state = _formManager.Export(descriptor.Form, layout.State, context);
}
return new XElement("Layout",
// Attributes
new XAttribute("Category", layout.Category ?? ""),
new XAttribute("Description", layout.Description ?? ""),
new XAttribute("State", layout.State),
new XAttribute("State", state ?? ""),
new XAttribute("Display", layout.Display),
new XAttribute("DisplayType", layout.DisplayType ?? ""),
new XAttribute("Type", layout.Type ?? ""),