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/Areas/API/Models/Job/_DateChangeModel.cs
+4 -4
View File
@@ -14,10 +14,10 @@ namespace Disco.Web.Areas.API.Models.Job
public _DateChangeModel SetDateTime(DateTime? date)
{
this.DateTimeFriendly = date.FromNow(null);
this.DateTimeISO8601 = date.ToISO8601();
this.DateTimeUnixEpoc = date.ToUnixEpoc() ?? -1;
this.DateTimeFull = date.ToFullDateTime(null);
DateTimeFriendly = date.FromNow(null);
DateTimeISO8601 = date.ToISO8601();
DateTimeUnixEpoc = date.ToUnixEpoc() ?? -1;
DateTimeFull = date.ToFullDateTime(null);
return this;
}
Disco.Web/Areas/Config/Controllers/AuthorizationRoleController.cs
+4 -4
View File
@@ -43,7 +43,7 @@ namespace Disco.Web.Areas.Config.Controllers
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigAuthorizationRoleShowModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigAuthorizationRoleShowModel>(ControllerContext, m);
return View(MVC.Config.AuthorizationRole.Views.Show, m);
}
@@ -66,7 +66,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigAuthorizationRoleIndexModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigAuthorizationRoleIndexModel>(ControllerContext, m);
return View(m);
}
@@ -81,7 +81,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigAuthorizationRoleCreateModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigAuthorizationRoleCreateModel>(ControllerContext, m);
return View(m);
}
@@ -106,7 +106,7 @@ namespace Disco.Web.Areas.Config.Controllers
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigAuthorizationRoleCreateModel>(this.ControllerContext, model);
UIExtensions.ExecuteExtensions<ConfigAuthorizationRoleCreateModel>(ControllerContext, model);
return View(model);
}
Disco.Web/Areas/Config/Controllers/DeviceBatchController.cs
+5 -5
View File
@@ -65,7 +65,7 @@ namespace Disco.Web.Areas.Config.Controllers
m.BulkGenerateDocumentTemplates = Database.DocumentTemplates.Where(t => !t.IsHidden).ToList();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceBatchShowModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDeviceBatchShowModel>(ControllerContext, m);
return View(MVC.Config.DeviceBatch.Views.Show, m);
}
@@ -74,7 +74,7 @@ namespace Disco.Web.Areas.Config.Controllers
var m = Models.DeviceBatch.IndexModel.Build(Database);
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceBatchIndexModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDeviceBatchIndexModel>(ControllerContext, m);
return View(m);
}
@@ -90,7 +90,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceBatchCreateModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDeviceBatchCreateModel>(ControllerContext, m);
return View(m);
}
@@ -115,7 +115,7 @@ namespace Disco.Web.Areas.Config.Controllers
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceBatchCreateModel>(this.ControllerContext, model);
UIExtensions.ExecuteExtensions<ConfigDeviceBatchCreateModel>(ControllerContext, model);
return View(model);
}
@@ -126,7 +126,7 @@ namespace Disco.Web.Areas.Config.Controllers
var m = new Models.DeviceBatch.TimelineModel();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceBatchTimelineModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDeviceBatchTimelineModel>(ControllerContext, m);
return View();
}
Disco.Web/Areas/Config/Controllers/DeviceFlagController.cs
+4 -4
View File
@@ -49,7 +49,7 @@ namespace Disco.Web.Areas.Config.Controllers
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceFlagShowModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDeviceFlagShowModel>(ControllerContext, m);
return View(MVC.Config.DeviceFlag.Views.Show, m);
}
@@ -70,7 +70,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceFlagIndexModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDeviceFlagIndexModel>(ControllerContext, m);
return View(m);
}
@@ -90,7 +90,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceFlagCreateModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDeviceFlagCreateModel>(ControllerContext, m);
return View(m);
}
@@ -115,7 +115,7 @@ namespace Disco.Web.Areas.Config.Controllers
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceFlagCreateModel>(this.ControllerContext, model);
UIExtensions.ExecuteExtensions<ConfigDeviceFlagCreateModel>(ControllerContext, model);
return View(model);
}
Disco.Web/Areas/Config/Controllers/DeviceProfileController.cs
+5 -5
View File
@@ -91,7 +91,7 @@ namespace Disco.Web.Areas.Config.Controllers
m.BulkGenerateDocumentTemplates = Database.DocumentTemplates.Where(t => !t.IsHidden).ToList();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceProfileShowModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDeviceProfileShowModel>(ControllerContext, m);
return View(MVC.Config.DeviceProfile.Views.Show, m);
}
@@ -100,7 +100,7 @@ namespace Disco.Web.Areas.Config.Controllers
var m = Models.DeviceProfile.IndexModel.Build(Database);
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceProfileIndexModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDeviceProfileIndexModel>(ControllerContext, m);
return View(m);
}
@@ -121,7 +121,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceProfileCreateModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDeviceProfileCreateModel>(ControllerContext, m);
return View(m);
}
@@ -148,7 +148,7 @@ namespace Disco.Web.Areas.Config.Controllers
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceProfileCreateModel>(this.ControllerContext, model);
UIExtensions.ExecuteExtensions<ConfigDeviceProfileCreateModel>(ControllerContext, model);
return View(model);
}
@@ -166,7 +166,7 @@ namespace Disco.Web.Areas.Config.Controllers
m.DeviceProfilesAndNone.Insert(0, new DeviceProfile() { Id = 0, Name = "<No Default>" });
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDeviceProfileDefaultsModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDeviceProfileDefaultsModel>(ControllerContext, m);
return View(m);
}
Disco.Web/Areas/Config/Controllers/DocumentTemplateController.cs
+9 -9
View File
@@ -43,7 +43,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateIndexModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateIndexModel>(ControllerContext, m);
return View(m);
}
@@ -72,7 +72,7 @@ namespace Disco.Web.Areas.Config.Controllers
m.BulkGenerateDownloadFilename = bulkGenerateFilename;
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateShowModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateShowModel>(ControllerContext, m);
return View(MVC.Config.DocumentTemplate.Views.Show, m);
}
@@ -99,7 +99,7 @@ namespace Disco.Web.Areas.Config.Controllers
m.DocumentTemplatesSelected = m.Package.GetDocumentTemplates(m.DocumentTemplates);
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateShowPackageModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateShowPackageModel>(ControllerContext, m);
return View(MVC.Config.DocumentTemplate.Views.ShowPackage, m);
}
@@ -110,7 +110,7 @@ namespace Disco.Web.Areas.Config.Controllers
var m = new ImportStatusModel();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateImportStatusModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateImportStatusModel>(ControllerContext, m);
return View();
}
@@ -124,7 +124,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateUndetectedPagesModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateUndetectedPagesModel>(ControllerContext, m);
return View(m);
}
@@ -136,7 +136,7 @@ namespace Disco.Web.Areas.Config.Controllers
m.UpdateModel(Database);
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateCreateModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateCreateModel>(ControllerContext, m);
return View(m);
}
@@ -174,7 +174,7 @@ namespace Disco.Web.Areas.Config.Controllers
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateCreateModel>(this.ControllerContext, model);
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateCreateModel>(ControllerContext, model);
return View(model);
}
@@ -185,7 +185,7 @@ namespace Disco.Web.Areas.Config.Controllers
var m = new CreatePackageModel();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateCreatePackageModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateCreatePackageModel>(ControllerContext, m);
return View(m);
}
@@ -210,7 +210,7 @@ namespace Disco.Web.Areas.Config.Controllers
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateCreatePackageModel>(this.ControllerContext, model);
UIExtensions.ExecuteExtensions<ConfigDocumentTemplateCreatePackageModel>(ControllerContext, model);
return View(model);
}
Disco.Web/Areas/Config/Controllers/EnrolmentController.cs
+2 -2
View File
@@ -19,7 +19,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigEnrolmentIndexModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigEnrolmentIndexModel>(ControllerContext, m);
return View(m);
}
@@ -34,7 +34,7 @@ namespace Disco.Web.Areas.Config.Controllers
m.DeviceBatches = Database.DeviceBatches.ToList();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigEnrolmentStatusModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigEnrolmentStatusModel>(ControllerContext, m);
return View(m);
}
Disco.Web/Areas/Config/Controllers/JobPreferencesController.cs
+1 -1
View File
@@ -26,7 +26,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigJobPreferencesIndexModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigJobPreferencesIndexModel>(ControllerContext, m);
return View(m);
}
Disco.Web/Areas/Config/Controllers/JobQueueController.cs
+4 -4
View File
@@ -55,7 +55,7 @@ namespace Disco.Web.Areas.Config.Controllers
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigJobQueueShowModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigJobQueueShowModel>(ControllerContext, m);
return View(MVC.Config.JobQueue.Views.Show, m);
}
@@ -71,7 +71,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigJobQueueIndexModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigJobQueueIndexModel>(ControllerContext, m);
return View(m);
}
@@ -92,7 +92,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigJobQueueCreateModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigJobQueueCreateModel>(ControllerContext, m);
return View(m);
}
@@ -117,7 +117,7 @@ namespace Disco.Web.Areas.Config.Controllers
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigJobQueueCreateModel>(this.ControllerContext, model);
UIExtensions.ExecuteExtensions<ConfigJobQueueCreateModel>(ControllerContext, model);
return View(model);
}
Disco.Web/Areas/Config/Controllers/LoggingController.cs
+2 -2
View File
@@ -29,7 +29,7 @@ namespace Disco.Web.Areas.Config.Controllers
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigLoggingIndexModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigLoggingIndexModel>(ControllerContext, m);
return View(m);
}
@@ -46,7 +46,7 @@ namespace Disco.Web.Areas.Config.Controllers
var m = new Models.Shared.TaskStatusModel() { SessionId = taskStatus.SessionId };
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigSharedTaskStatusModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigSharedTaskStatusModel>(ControllerContext, m);
return View(m);
}
Disco.Web/Areas/Config/Controllers/OrganisationController.cs
+1 -1
View File
@@ -22,7 +22,7 @@ namespace Disco.Web.Areas.Config.Controllers
viewModel.OrganisationAddresses = Database.DiscoConfiguration.OrganisationAddresses.Addresses.OrderBy(a => a.Name).ToList();
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigOrganisationIndexModel>(this.ControllerContext, viewModel);
UIExtensions.ExecuteExtensions<ConfigOrganisationIndexModel>(ControllerContext, viewModel);
return View(viewModel);
}
Disco.Web/Areas/Config/Controllers/UserFlagController.cs
+4 -4
View File
@@ -50,7 +50,7 @@ namespace Disco.Web.Areas.Config.Controllers
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigUserFlagShowModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigUserFlagShowModel>(ControllerContext, m);
return View(MVC.Config.UserFlag.Views.Show, m);
}
@@ -71,7 +71,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigUserFlagIndexModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigUserFlagIndexModel>(ControllerContext, m);
return View(m);
}
@@ -91,7 +91,7 @@ namespace Disco.Web.Areas.Config.Controllers
};
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigUserFlagCreateModel>(this.ControllerContext, m);
UIExtensions.ExecuteExtensions<ConfigUserFlagCreateModel>(ControllerContext, m);
return View(m);
}
@@ -116,7 +116,7 @@ namespace Disco.Web.Areas.Config.Controllers
}
// UI Extensions
UIExtensions.ExecuteExtensions<ConfigUserFlagCreateModel>(this.ControllerContext, model);
UIExtensions.ExecuteExtensions<ConfigUserFlagCreateModel>(ControllerContext, model);
return View(model);
}
Disco.Web/Areas/Config/Models/AuthorizationRole/ShowModel.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Disco.Web.Areas.Config.Models.AuthorizationRole
{
get
{
var rootNode = FancyTreeNode.FromClaimNavigatorItem(this.ClaimNavigator, false);
var rootNode = FancyTreeNode.FromClaimNavigatorItem(ClaimNavigator, false);
rootNode.expanded = true;
return new FancyTreeNode[] {
Disco.Web/Areas/Config/Models/DeviceProfile/ShowModel.cs
+3 -3
View File
@@ -22,15 +22,15 @@ namespace Disco.Web.Areas.Config.Models.DeviceProfile
{
get
{
if (string.IsNullOrEmpty(this.DeviceProfile.OrganisationalUnit))
if (string.IsNullOrEmpty(DeviceProfile.OrganisationalUnit))
{
var domain = ActiveDirectory.Context.PrimaryDomain;
return domain.FriendlyDistinguishedNamePath(domain.DefaultComputerContainer);
}
else
{
var domain = ActiveDirectory.Context.GetDomainFromDistinguishedName(this.DeviceProfile.OrganisationalUnit);
return domain.FriendlyDistinguishedNamePath(this.DeviceProfile.OrganisationalUnit);
var domain = ActiveDirectory.Context.GetDomainFromDistinguishedName(DeviceProfile.OrganisationalUnit);
return domain.FriendlyDistinguishedNamePath(DeviceProfile.OrganisationalUnit);
}
}
}
Disco.Web/Areas/Config/Models/DocumentTemplate/CreateModel.cs
+2 -2
View File
@@ -49,9 +49,9 @@ namespace Disco.Web.Areas.Config.Models.DocumentTemplate
public void UpdateModel(DiscoDataContext Database)
{
if (this.JobTypes == null)
if (JobTypes == null)
JobTypes = Database.JobTypes.ToList();
if (this.JobSubTypes == null)
if (JobSubTypes == null)
JobSubTypes = Database.JobSubTypes.ToList();
}
Disco.Web/Areas/Config/Models/DocumentTemplate/ShowModel.cs
+5 -5
View File
@@ -43,20 +43,20 @@ namespace Disco.Web.Areas.Config.Models.DocumentTemplate
public void UpdateModel(DiscoDataContext Database)
{
switch (this.DocumentTemplate.Scope)
switch (DocumentTemplate.Scope)
{
case Disco.Models.Repository.DocumentTemplate.DocumentTemplateScopes.Device:
this.StoredInstanceCount = Database.DeviceAttachments.Count(a => a.DocumentTemplateId == this.DocumentTemplate.Id);
StoredInstanceCount = Database.DeviceAttachments.Count(a => a.DocumentTemplateId == DocumentTemplate.Id);
break;
case Disco.Models.Repository.DocumentTemplate.DocumentTemplateScopes.Job:
this.StoredInstanceCount = Database.JobAttachments.Count(a => a.DocumentTemplateId == this.DocumentTemplate.Id);
StoredInstanceCount = Database.JobAttachments.Count(a => a.DocumentTemplateId == DocumentTemplate.Id);
break;
case Disco.Models.Repository.DocumentTemplate.DocumentTemplateScopes.User:
this.StoredInstanceCount = Database.UserAttachments.Count(a => a.DocumentTemplateId == this.DocumentTemplate.Id);
StoredInstanceCount = Database.UserAttachments.Count(a => a.DocumentTemplateId == DocumentTemplate.Id);
break;
}
if (this.JobTypes == null)
if (JobTypes == null)
JobTypes = Database.JobTypes.Include("JobSubTypes").ToList();
UserFlags = Database.UserFlags.ToList();
Disco.Web/Areas/Config/Models/DocumentTemplate/UndetectedPagesModel.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Disco.Web.Areas.Config.Models.DocumentTemplate
list.Add(new SelectListItem() { Selected = false, Value = "--DEVICE", Text = "<Generic Device Document>" });
list.Add(new SelectListItem() { Selected = true, Value = "--JOB", Text = "<Generic Job Document>" });
list.Add(new SelectListItem() { Selected = false, Value = "--USER", Text = "<Generic User Document>" });
list.AddRange(this.DocumentTemplates.ToSelectListItems());
list.AddRange(DocumentTemplates.ToSelectListItems());
return list;
}
}
Disco.Web/Areas/Config/Models/JobPreferences/IndexModel.cs
+2 -2
View File
@@ -67,7 +67,7 @@ namespace Disco.Web.Areas.Config.Models.JobPreferences
new KeyValuePair<int, string>(56, "8 Weeks")
};
var current = this.LongRunningJobDaysThreshold;
var current = LongRunningJobDaysThreshold;
if (!options.Any(o => o.Key == current))
{
options.Add(new KeyValuePair<int, string>(current, string.Format("{0} Days", current)));
@@ -103,7 +103,7 @@ namespace Disco.Web.Areas.Config.Models.JobPreferences
new KeyValuePair<int, string>(60 * 24 * 7 * 8, "8 weeks")
};
var current = this.StaleJobMinutesThreshold;
var current = StaleJobMinutesThreshold;
if (!options.Any(o => o.Key == current))
{
options.Add(new KeyValuePair<int, string>(current, string.Format("{0} Minutes", current)));
Disco.Web/Areas/Config/Models/Plugins/PluginConfigurationViewModel.cs
+3 -3
View File
@@ -11,10 +11,10 @@ namespace Disco.Web.Areas.Config.Models.Plugins
public PluginConfigurationViewModel(PluginConfigurationHandler.PluginConfigurationHandlerGetResponse response)
{
this.Manifest = response.Manifest;
Manifest = response.Manifest;
this.PluginViewType = response.ViewType;
this.PluginViewModel = response.Model;
PluginViewType = response.ViewType;
PluginViewModel = response.Model;
}
}
}
Disco.Web/Areas/Config/Models/SystemConfig/IndexModel.cs
+4 -4
View File
@@ -49,28 +49,28 @@ namespace Disco.Web.Areas.Config.Models.SystemConfig
{
get
{
return this.DatabaseConnectionString.Value.DataSource;
return DatabaseConnectionString.Value.DataSource;
}
}
public string DatabaseName
{
get
{
return this.DatabaseConnectionString.Value.InitialCatalog;
return DatabaseConnectionString.Value.InitialCatalog;
}
}
public string DatabaseAuthentication
{
get
{
return this.DatabaseConnectionString.Value.IntegratedSecurity ? "Integrated Authentication" : "SQL Authentication";
return DatabaseConnectionString.Value.IntegratedSecurity ? "Integrated Authentication" : "SQL Authentication";
}
}
public string DatabaseSqlAuthUsername
{
get
{
return this.DatabaseConnectionString.Value.IntegratedSecurity ? null : this.DatabaseConnectionString.Value.UserID;
return DatabaseConnectionString.Value.IntegratedSecurity ? null : DatabaseConnectionString.Value.UserID;
}
}
#endregion
Disco.Web/Areas/Public/Models/UserHeldDevices/HeldJobDeviceModel.cs
+14 -14
View File
@@ -21,27 +21,27 @@ namespace Disco.Web.Areas.Public.Models.UserHeldDevices
{
var uhdm = new UserHeldDeviceModel()
{
UserId = this.UserId,
UserDisplayName = this.UserDisplayName,
ReadyForReturn = this.ReadyForReturn,
WaitingForUserAction = this.WaitingForUserAction,
DeviceProfileId = this.DeviceProfileId,
DeviceAddress = (this.DeviceAddressId.HasValue ? Database.DiscoConfiguration.OrganisationAddresses.GetAddress(this.DeviceAddressId.Value)?.ShortName : string.Empty)
UserId = UserId,
UserDisplayName = UserDisplayName,
ReadyForReturn = ReadyForReturn,
WaitingForUserAction = WaitingForUserAction,
DeviceProfileId = DeviceProfileId,
DeviceAddress = (DeviceAddressId.HasValue ? Database.DiscoConfiguration.OrganisationAddresses.GetAddress(DeviceAddressId.Value)?.ShortName : string.Empty)
};
var n = DateTime.Now;
if (!this.ReadyForReturn && this.EstimatedReturnTime.HasValue && this.EstimatedReturnTime.Value > n)
if (!ReadyForReturn && EstimatedReturnTime.HasValue && EstimatedReturnTime.Value > n)
{
uhdm.EstimatedReturnTime = this.EstimatedReturnTime.FromNow();
uhdm.EstimatedReturnTime = EstimatedReturnTime.FromNow();
}
if (this.ReadyForReturn)
if (ReadyForReturn)
{
uhdm.ReadyForReturnSince = this.ReadyForReturnSince.FromNow();
uhdm.IsAlert = (this.ReadyForReturnSince.Value < DateTime.Now.AddDays(-3));
uhdm.ReadyForReturnSince = ReadyForReturnSince.FromNow();
uhdm.IsAlert = (ReadyForReturnSince.Value < DateTime.Now.AddDays(-3));
}
if (this.WaitingForUserAction)
if (WaitingForUserAction)
{
uhdm.WaitingForUserActionSince = this.WaitingForUserActionSince.FromNow();
uhdm.IsAlert = (this.WaitingForUserActionSince.Value < n.AddDays(-6));
uhdm.WaitingForUserActionSince = WaitingForUserActionSince.FromNow();
uhdm.IsAlert = (WaitingForUserActionSince.Value < n.AddDays(-6));
}
return uhdm;
}