Skip to content

Commit 9f1d37f

Browse files
author
TimoPerplex
committed
Small bugfixes in the DeleteOnSubmit workflow (didn't work with datetimes), and fixed an error when you didn't have any validationmessages setup
1 parent ae5b693 commit 9f1d37f

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
lines changed

Perplex.Umbraco.Forms/FieldTypes/PerplexFileUpload.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public override IEnumerable<string> ValidateField(Form form, Field field, IEnume
8989
postedValues = null;
9090
return (IEnumerable<string>)new string[1]
9191
{
92-
string.Format(StringExtensions.ParsePlaceHolders(field.Settings.First(x => x.Key == "AllowedFileTypesErrorMessage").Value ?? ""), (object) field.Caption)
92+
string.Format(StringExtensions.ParsePlaceHolders(field.Settings.FirstOrDefault(x => x.Key == "AllowedFileTypesErrorMessage").Value ?? ""), (object) field.Caption)
9393
};
9494
}
9595
}
@@ -112,7 +112,7 @@ public override IEnumerable<string> ValidateField(Form form, Field field, IEnume
112112
postedValues = null;
113113
return (IEnumerable<string>)new string[1]
114114
{
115-
string.Format(StringExtensions.ParsePlaceHolders(field.Settings.First(x => x.Key == "MaximumFileSizeErrorMessage").Value ?? ""), (object) field.Caption)
115+
string.Format(StringExtensions.ParsePlaceHolders(field.Settings.FirstOrDefault(x => x.Key == "MaximumFileSizeErrorMessage").Value ?? ""), (object) field.Caption)
116116
};
117117
}
118118

Perplex.Umbraco.Forms/FieldTypes/PerplexImageUpload.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public override IEnumerable<string> ValidateField(Form form, Field field, IEnume
9292
postedValues = null;
9393
return (IEnumerable<string>)new string[1]
9494
{
95-
string.Format(StringExtensions.ParsePlaceHolders(field.Settings.First(x => x.Key == "AllowedFileTypesErrorMessage").Value ?? ""), (object) field.Caption)
95+
string.Format(StringExtensions.ParsePlaceHolders(field.Settings.FirstOrDefault(x => x.Key == "AllowedFileTypesErrorMessage").Value ?? ""), (object) field.Caption)
9696
};
9797
}
9898
}
@@ -115,7 +115,7 @@ public override IEnumerable<string> ValidateField(Form form, Field field, IEnume
115115
postedValues = null;
116116
return (IEnumerable<string>)new string[1]
117117
{
118-
string.Format(StringExtensions.ParsePlaceHolders(field.Settings.First(x => x.Key == "MaximumFileSizeErrorMessage").Value ?? ""), (object) field.Caption)
118+
string.Format(StringExtensions.ParsePlaceHolders(field.Settings.FirstOrDefault(x => x.Key == "MaximumFileSizeErrorMessage").Value ?? ""), (object) field.Caption)
119119
};
120120
}
121121

Perplex.Umbraco.Forms/Workflows/DeleteOnSubmitWorkflow.cs

+20-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,26 @@ public override WorkflowExecutionStatus Execute(Record record, RecordEventArgs e
5050

5151
// Clear the entry data and replace with a "-"
5252
foreach (var field in e.Record.RecordFields)
53-
field.Value.Values = new List<object>() { "-" };
53+
{
54+
// Determine by datatype which nullable value we should use
55+
switch (field.Value.DataType)
56+
{
57+
case FieldDataType.Integer:
58+
field.Value.Values = new List<object>() { 0 };
59+
break;
60+
case FieldDataType.DateTime:
61+
field.Value.Values = new List<object>() { new DateTime(1900, 01, 01) }; // cannot use minvalue :/
62+
break;
63+
case FieldDataType.Bit:
64+
field.Value.Values = new List<object>() { false };
65+
break;
66+
case FieldDataType.String:
67+
case FieldDataType.LongString:
68+
default:
69+
field.Value.Values = new List<object>() { "-" };
70+
break;
71+
}
72+
}
5473

5574
//The re-generate the record data
5675
e.Record.GenerateRecordDataAsJson();

0 commit comments

Comments
 (0)