Jelajahi Sumber

Fix to default columns of a lookup, and fixed another bug in lookups

Kenric Nugteren 1 tahun lalu
induk
melakukan
26904c35b4
1 mengubah file dengan 5 tambahan dan 1 penghapusan
  1. 5 1
      InABox.Core/ILookupDefinition.cs

+ 5 - 1
InABox.Core/ILookupDefinition.cs

@@ -135,7 +135,7 @@ namespace InABox.Core
 
 
         private static ILookupDefinitionGenerator? GetLookupGenerator(IProperty? property)
         private static ILookupDefinitionGenerator? GetLookupGenerator(IProperty? property)
         {
         {
-            var generator = property?.Parent?.GetAttribute<LookupDefinitionAttribute>()?.Generator
+            var generator = property?.GetAttribute<LookupDefinitionAttribute>()?.Generator
                 ?? (property != null ? _lookupGenerators.GetValueOrDefault(property) : null);
                 ?? (property != null ? _lookupGenerators.GetValueOrDefault(property) : null);
             return generator != null
             return generator != null
                 ? Activator.CreateInstance(generator) as ILookupDefinitionGenerator
                 ? Activator.CreateInstance(generator) as ILookupDefinitionGenerator
@@ -313,6 +313,10 @@ namespace InABox.Core
                     columns.Add(prop);
                     columns.Add(prop);
                 }
                 }
             }
             }
+            if (!columns.Any())
+            {
+                columns.DefaultColumns();
+            }
 
 
             return columns;
             return columns;
         }
         }