Просмотр исходного кода

Merge remote-tracking branch 'origin/kenric' into frank

frogsoftware 10 месяцев назад
Родитель
Сommit
1e5f03eff4

+ 7 - 0
InABox.Core/Editors/Utils/SecurityAttribute.cs

@@ -3,6 +3,13 @@ using System.Linq;
 
 namespace InABox.Core
 {
+    /// <summary>
+    /// Causes a property to update its editable status based on <see cref="SecurityDescriptor"/>. If the current user does not have the security token,
+    /// then the property's visiblity is restricted to at most <see cref="Editable"/>.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="Editable"/> defaults to <see cref="Editable.Hidden"/>.
+    /// </remarks>
     [AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
     public class SecurityAttribute : Attribute
     {

+ 1 - 1
inabox.wpf/DynamicGrid/Columns/DynamicTextColumn.cs

@@ -5,7 +5,7 @@ namespace InABox.DynamicGrid;
 
 public class DynamicTextColumn : DynamicActionColumn
 {
-    public delegate object GetTextDelegate(CoreRow? row);
+    public delegate object? GetTextDelegate(CoreRow? row);
 
     public GetTextDelegate Text { get; protected set; }
         

+ 2 - 2
inabox.wpf/DynamicGrid/DynamicGrid.cs

@@ -1405,11 +1405,11 @@ public abstract class DynamicGrid<T> : DynamicGrid, IDynamicGridUIComponentParen
         DoEdit();
     }
 
-    protected virtual void DoAdd(bool OpenEditorOnDirectEdit = false)
+    protected virtual void DoAdd(bool openEditorOnDirectEdit = false)
     {
         //CoreRow row = (SelectedRow > -1) && (SelectedRow < Data.Rows.Count) ?  Data.Rows[this.SelectedRow] : null;
 
-        if (IsDirectEditMode() && !OpenEditorOnDirectEdit)
+        if (IsDirectEditMode() && !openEditorOnDirectEdit)
         {
             CreateItems(null);
         }