jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug Fix #79 Ban '/' from serial numbers

Browse Source
This commit is contained in:
Gary Sharp
2016-09-29 17:47:33 +10:00
parent 669de7e46b
commit 3c521541fd
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Devices/Importing/Fields/DeviceSerialNumberImportField.cs
+6 -2
View File
@@ -28,7 +28,11 @@ namespace Disco.Services.Devices.Importing.Fields
{
parsedValue = Value.Trim();
if (parsedValue.Length > maxLength)
return Error(string.Format("Cannot be more than {0} characters", maxLength));
return Error($"Cannot be more than {maxLength} characters");
if (parsedValue.Contains(@"/"))
return Error(@"The '/' character is not allowed.");
if (parsedValue.Contains(@"\"))
return Error(@"The '\' character is not allowed.");
}
// Duplicate
@@ -38,7 +42,7 @@ namespace Disco.Services.Devices.Importing.Fields
.Where(r => IsDeviceSerialNumberValid(r.Item2))
.FirstOrDefault(r => r.Item2.Equals(parsedValue, StringComparison.OrdinalIgnoreCase));
if (duplicate != null)
return Error(string.Format("This Device Serial Number was already present on Row {0}", duplicate.Item1 + 1));
return Error($"This Device Serial Number was already present on Row {duplicate.Item1 + 1}");
// No action required
return Success(EntityState.Unchanged);