FilteredMasterObjectViewController breaks XAF lookupfiltering, replac…

…e DataSourceCriteriaAttribute with MasterObjectDataSourceCriteriaAttribute #473
eXpandFramework · Aug 6, 2019 · 35e86e3 · 35e86e3
1 parent aeea7a0
commit 35e86e3
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/.../Xpand.Persistent/Xpand.Persistent.Base/General/Controllers/MasterObjectViewController.cs b/.../Xpand.Persistent/Xpand.Persistent.Base/General/Controllers/MasterObjectViewController.cs
@@ -3,12 +3,23 @@
 using DevExpress.Persistent.Base;
 
 namespace Xpand.Persistent.Base.General.Controllers {
+    [AttributeUsage(AttributeTargets.Property)]
+    public sealed class MasterObjectDataSourceCriteriaAttribute : ModelExportedValueAttribute {
+        private readonly String _dataSourceCriteria;
+        public MasterObjectDataSourceCriteriaAttribute(String dataSourceCriteria) {
+            _dataSourceCriteria = dataSourceCriteria;
+        }
+
+        public String DataSourceCriteria => _dataSourceCriteria;
+
+        public override Object Value => _dataSourceCriteria;
+    }
     public class FilteredMasterObjectViewController:MasterObjectViewController<object,object>{
         private string _criteria;
 
         protected override void OnActivated(){
             var collectionSource = View.CollectionSource as PropertyCollectionSource;
-            var criteriaAttribute = collectionSource?.MemberInfo.FindAttribute<DataSourceCriteriaAttribute>();
+            var criteriaAttribute = collectionSource?.MemberInfo.FindAttribute<MasterObjectDataSourceCriteriaAttribute>();
             if (criteriaAttribute != null){
                 _criteria = criteriaAttribute.DataSourceCriteria;
             }