Преглед изворни кода

Added default result to script document

Kenric Nugteren пре 1 година
родитељ
комит
4ccaa002b9
2 измењених фајлова са 6 додато и 8 уклоњено
  1. 2 6
      inabox.scripting/ScriptDocument.cs
  2. 4 2
      inabox.wpf/DynamicGrid/DynamicGrid.cs

+ 2 - 6
inabox.scripting/ScriptDocument.cs

@@ -186,9 +186,9 @@ namespace InABox.Scripting
             return prop != null ? prop.Value : defaultvalue;
             return prop != null ? prop.Value : defaultvalue;
         }
         }
 
 
-        public bool Execute(string classname = "Module", string methodname = "Execute", object[] parameters = null)
+        public bool Execute(string classname = "Module", string methodname = "Execute", object[] parameters = null, bool defaultResult = false)
         {
         {
-            var result = false;
+            var result = defaultResult;
 
 
             if (!compiled.HasValue)
             if (!compiled.HasValue)
             {
             {
@@ -237,10 +237,6 @@ namespace InABox.Scripting
                                 property.Value = prop.GetValue(obj);
                                 property.Value = prop.GetValue(obj);
                         }
                         }
                 }
                 }
-                else
-                {
-                    result = false;
-                }
             }
             }
 
 
             return result;
             return result;

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

@@ -2029,8 +2029,10 @@ namespace InABox.DynamicGrid
                         {
                         {
                             var data = lookupEditor.Values(column.ColumnName);
                             var data = lookupEditor.Values(column.ColumnName);
 
 
-                            var items = new List<Tuple<object?, string>>();
-                            items.Add(new(null, ""));
+                            var items = new List<Tuple<object?, string>>
+                            {
+                                new(null, "")
+                            };
                             foreach (var row in data.Rows)
                             foreach (var row in data.Rows)
                                 items.Add(new(row[data.Columns[0].ColumnName], (row["Display"] ?? "").ToString() ?? ""));
                                 items.Add(new(row[data.Columns[0].ColumnName], (row["Display"] ?? "").ToString() ?? ""));