Sfoglia il codice sorgente

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

frogsoftware 1 anno fa
parent
commit
13074043eb

+ 1 - 1
InABox.Poster.Timberline/TimberlinePostResult.cs

@@ -27,7 +27,7 @@ namespace InABox.Poster.Timberline
         public IEnumerable<KeyValuePair<Type, IEnumerable<IPostableFragment<TPostable>>>> Fragments =>
             fragments.Select(x => new KeyValuePair<Type, IEnumerable<IPostableFragment<TPostable>>>(x.Key, x.Value));
 
-        public void AddSuccess(TPostable post, TExport export)
+        public void AddSuccess(TPostable post, TExport? export)
         {
             post.Post();
             items.Add(new Tuple<TPostable, TExport?>(post, export));

+ 4 - 2
inabox.wpf/DigitalForms/Designer/Controls/Fields/DFLookupControl.cs

@@ -142,9 +142,11 @@ namespace InABox.DynamicGrid
             var lookup = lookups!.FirstOrDefault(x => x.Key == value);
             Combo.SelectedItem = lookup;
 
+            var combo = lookup.Value;
+
             _value.ID = lookup.Key;
-            _value.Text = _value.ID != Guid.Empty ? lookup.Value.Item1 : "";
-            _value.Values = lookup.Value.Item2;
+            _value.Text = _value.ID != Guid.Empty ? combo?.Item1 ?? "" : "";
+            _value.Values = combo?.Item2 ?? new Dictionary<string, object?>();
         }
         protected override bool IsEmpty() => Combo.SelectedValue == null || (Guid)Combo.SelectedValue == Guid.Empty;
     }

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

@@ -470,7 +470,7 @@ namespace InABox.DynamicGrid
             {
                 if (Loading.Visibility == Visibility.Visible)
                 {
-                    Logger.Send(LogType.Information, this.GetType().EntityName().Split(".").Last(), "Loading Fader Restarting");
+                    //Logger.Send(LogType.Information, this.GetType().EntityName().Split(".").Last(), "Loading Fader Restarting");
                     Loading.BeginAnimation(Label.OpacityProperty, LoadingFader);
                 }
             };