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

qol: remove this

Browse Source
This commit is contained in:
Gary Sharp
2025-07-20 11:39:42 +10:00
parent b4e54c9edf
commit 4e518d6684
56 changed files with 282 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Models/InitialConfig/DatabaseModel.cs
+8 -8
View File
@@ -11,9 +11,9 @@ namespace Disco.Web.Models.InitialConfig
public DatabaseModel()
{
// Set Defaults
this.Server = "(local)";
this.DatabaseName = "Disco";
this.AuthMethod = "SSPI";
Server = "(local)";
DatabaseName = "Disco";
AuthMethod = "SSPI";
}
public static DatabaseModel FromConnectionString(string ConnectionString)
@@ -51,11 +51,11 @@ namespace Disco.Web.Models.InitialConfig
{
var csb = new SqlConnectionStringBuilder()
{
DataSource = this.Server,
InitialCatalog = this.DatabaseName,
IntegratedSecurity = (this.AuthMethod.Equals("SSPI", StringComparison.OrdinalIgnoreCase)),
UserID = (this.AuthMethod.Equals("SQL", StringComparison.OrdinalIgnoreCase)) ? this.Auth_SQL_Username : string.Empty,
Password = (this.AuthMethod.Equals("SQL", StringComparison.OrdinalIgnoreCase)) ? this.Auth_SQL_Password : string.Empty,
DataSource = Server,
InitialCatalog = DatabaseName,
IntegratedSecurity = (AuthMethod.Equals("SSPI", StringComparison.OrdinalIgnoreCase)),
UserID = (AuthMethod.Equals("SQL", StringComparison.OrdinalIgnoreCase)) ? Auth_SQL_Username : string.Empty,
Password = (AuthMethod.Equals("SQL", StringComparison.OrdinalIgnoreCase)) ? Auth_SQL_Password : string.Empty,
ApplicationName = "Disco ICT WebApp",
MultipleActiveResultSets = true,
Pooling = true
Disco.Web/Models/InitialConfig/FileStoreModel.cs
+8 -8
View File
@@ -21,10 +21,10 @@ namespace Disco.Web.Models.InitialConfig
{
if (!string.IsNullOrWhiteSpace(FileStoreLocation))
{
var branches = this.FileStoreLocation.ToUpper().Split(Path.DirectorySeparatorChar);
var branchesCase = this.FileStoreLocation.Split(Path.DirectorySeparatorChar);
var branches = FileStoreLocation.ToUpper().Split(Path.DirectorySeparatorChar);
var branchesCase = FileStoreLocation.Split(Path.DirectorySeparatorChar);
FileStoreDirectoryModel branchModel;
FileStoreDirectoryModel branchParent = this.DirectoryModel;
FileStoreDirectoryModel branchParent = DirectoryModel;
for (int i = 0; i < branches.Length; i++)
{
var branch = branches[i];
@@ -154,10 +154,10 @@ namespace Disco.Web.Models.InitialConfig
internal void ExpandSubDirectories()
{
if (this.SubDirectories == null)
if (SubDirectories == null)
{
this.SubDirectories = new Dictionary<string, FileStoreDirectoryModel>();
if (!this.IsNew)
SubDirectories = new Dictionary<string, FileStoreDirectoryModel>();
if (!IsNew)
{
var dirInfo = new DirectoryInfo(Path);
if (dirInfo.Exists)
@@ -167,13 +167,13 @@ namespace Disco.Web.Models.InitialConfig
if (((subDir.Attributes & FileAttributes.System) != FileAttributes.System) &&
((subDir.Attributes & FileAttributes.Hidden) != FileAttributes.Hidden))
{
this.SubDirectories.Add(subDir.Name.ToUpper(), FileStoreDirectoryModel.FromInfo(subDir));
SubDirectories.Add(subDir.Name.ToUpper(), FileStoreDirectoryModel.FromInfo(subDir));
}
}
}
else
{
this.IsNew = true;
IsNew = true;
}
}
}
Disco.Web/Models/InitialConfig/WelcomeModel.cs
+3 -3
View File
@@ -15,7 +15,7 @@ namespace Disco.Web.Models.InitialConfig
{
if (_OrganisationNameCache != null)
{
this.OrganisationName = _OrganisationNameCache;
OrganisationName = _OrganisationNameCache;
return true;
}
@@ -23,8 +23,8 @@ namespace Disco.Web.Models.InitialConfig
if (whoAmIResult != null && !string.IsNullOrWhiteSpace(whoAmIResult.Item2))
{
this.OrganisationName = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(whoAmIResult.Item2);
_OrganisationNameCache = this.OrganisationName;
OrganisationName = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(whoAmIResult.Item2);
_OrganisationNameCache = OrganisationName;
return true;
}