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

qol: simplify calls

Browse Source
This commit is contained in:
Gary Sharp
2025-07-20 15:20:22 +10:00
parent 1add4ee0f5
commit 9656c15c4b
61 changed files with 214 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Models/InitialConfig/CompleteModel.cs
+3 -3
View File
@@ -36,8 +36,8 @@ namespace Disco.Web.Models.InitialConfig
try
{
// Make Connection String Persistent
Disco.Data.Repository.DiscoDatabaseConnectionFactory.SetDiscoDataContextConnectionString(
Disco.Data.Repository.DiscoDatabaseConnectionFactory.DiscoDataContextConnectionString, true);
Data.Repository.DiscoDatabaseConnectionFactory.SetDiscoDataContextConnectionString(
Data.Repository.DiscoDatabaseConnectionFactory.DiscoDataContextConnectionString, true);
RegistryDatabaseResult = null;
}
catch (Exception ex)
@@ -52,7 +52,7 @@ namespace Disco.Web.Models.InitialConfig
Dns.GetHostEntry("discoict.com.au");
try
{
HttpWebRequest wReq = (HttpWebRequest)HttpWebRequest.Create("https://discoict.com.au/");
HttpWebRequest wReq = (HttpWebRequest)WebRequest.Create("https://discoict.com.au/");
// Added: 2013-02-08 G#
// Fix for Proxy Servers which dont support KeepAlive
wReq.KeepAlive = false;
Disco.Web/Models/InitialConfig/FileStoreModel.cs
+3 -3
View File
@@ -9,7 +9,7 @@ namespace Disco.Web.Models.InitialConfig
{
public FileStoreModel()
{
DirectoryModel = FileStoreModel.FileStoreDirectoryModel.DirectoryRoots();
DirectoryModel = FileStoreDirectoryModel.DirectoryRoots();
}
[Required(), CustomValidation(typeof(FileStoreModel), "DirectoryPermissionRequired")]
@@ -145,7 +145,7 @@ namespace Disco.Web.Models.InitialConfig
foreach (var driveInfo in DriveInfo.GetDrives())
{
if (driveInfo.DriveType == DriveType.Fixed)
root.SubDirectories.Add(driveInfo.Name.Substring(0, 2).ToUpper(), FileStoreDirectoryModel.FromInfo(driveInfo));
root.SubDirectories.Add(driveInfo.Name.Substring(0, 2).ToUpper(), FromInfo(driveInfo));
}
return root;
@@ -166,7 +166,7 @@ namespace Disco.Web.Models.InitialConfig
if (((subDir.Attributes & FileAttributes.System) != FileAttributes.System) &&
((subDir.Attributes & FileAttributes.Hidden) != FileAttributes.Hidden))
{
SubDirectories.Add(subDir.Name.ToUpper(), FileStoreDirectoryModel.FromInfo(subDir));
SubDirectories.Add(subDir.Name.ToUpper(), FromInfo(subDir));
}
}
}
Disco.Web/Models/Job/LogRepairModel.cs
+1 -1
View File
@@ -29,7 +29,7 @@ namespace Disco.Web.Models.Job
public int? OrganisationAddressId { get; set; }
[Required(ErrorMessage = "Please specify a Repair Provider")]
public string RepairProviderId { get; set; }
[Required(ErrorMessage = "A fault description is required"), DataType(System.ComponentModel.DataAnnotations.DataType.MultilineText)]
[Required(ErrorMessage = "A fault description is required"), DataType(DataType.MultilineText)]
public string RepairDescription { get; set; }
public List<int> PublishAttachmentIds { get; set; }
[Required]
Disco.Web/Models/Job/LogWarrantyModel.cs
+1 -1
View File
@@ -29,7 +29,7 @@ namespace Disco.Web.Models.Job
public int? OrganisationAddressId { get; set; }
[Required(ErrorMessage = "Please specify a Warranty Provider")]
public string WarrantyProviderId { get; set; }
[Required(ErrorMessage = "A fault description is required"), DataType(System.ComponentModel.DataAnnotations.DataType.MultilineText)]
[Required(ErrorMessage = "A fault description is required"), DataType(DataType.MultilineText)]
public string FaultDescription { get; set; }
public List<int> PublishAttachmentIds { get; set; }
[Required]