Explorar o código

Fix to readonly overriding and dflayoutheader alignment now doesn't cause exception when trying to edit because of an editor type mismatch

Kenric Nugteren hai 1 ano
pai
achega
28593b2419

+ 3 - 1
InABox.Core/DigitalForms/Layouts/Controls/DFLayoutHeader/DFLayoutHeader.cs

@@ -23,7 +23,7 @@ namespace InABox.Core
         [EditorSequence(0)]
         public bool Collapsed { get; set; } = false;
 
-        [CheckBoxEditor]
+        [EnumLookupEditor(typeof(DFLayoutHeaderAlignment))]
         [EditorSequence(1)]
         public DFLayoutHeaderAlignment Alignment { get; set; } = DFLayoutHeaderAlignment.Left;
 
@@ -47,6 +47,7 @@ namespace InABox.Core
 
             Header = GetProperty("Header", "");
             Collapsed = GetProperty("Collapsed", false);
+            Alignment = GetProperty("Alignment", DFLayoutHeaderAlignment.Left);
             Style.LoadProperties(this);
         }
 
@@ -56,6 +57,7 @@ namespace InABox.Core
 
             SetProperty("Header", Header);
             SetProperty("Collapsed", Collapsed);
+            SetProperty("Alignment", Alignment);
             Style.SaveProperties(this);
         }
 

+ 1 - 1
inabox.wpf/DynamicGrid/DynamicDataGrid.cs

@@ -128,7 +128,7 @@ namespace InABox.DynamicGrid
 
         protected override void BeforeLoad(IDynamicEditorForm form, TEntity[] items)
         {
-            form.ReadOnly = !Security.CanEdit<TEntity>();
+            form.ReadOnly = form.ReadOnly || !Security.CanEdit<TEntity>();
             base.BeforeLoad(form, items);
         }