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

fixup Disco -> Disco ICT

Browse Source
This commit is contained in:
Gary Sharp
2023-07-26 19:01:31 +10:00
parent e204ea4d5f
commit 6fcb1a1eae
68 changed files with 221 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Client/Interop/Hardware.cs
+5 -5
View File
@@ -331,7 +331,7 @@ namespace Disco.Client.Interop
} }
catch (Exception ex) catch (Exception ex)
{ {
throw new Exception("Disco Client was unable to retrieve BIOS information from WMI", ex); throw new Exception("Disco ICT Client was unable to retrieve BIOS information from WMI", ex);
} }
} }
@@ -394,7 +394,7 @@ namespace Disco.Client.Interop
} }
catch (Exception ex) catch (Exception ex)
{ {
throw new Exception("Disco Client was unable to retrieve ComputerSystem information from WMI", ex); throw new Exception("Disco ICT Client was unable to retrieve ComputerSystem information from WMI", ex);
} }
} }
@@ -427,7 +427,7 @@ namespace Disco.Client.Interop
} }
catch (Exception ex) catch (Exception ex)
{ {
throw new Exception("Disco Client was unable to retrieve ComputerSystem information from WMI", ex); throw new Exception("Disco ICT Client was unable to retrieve ComputerSystem information from WMI", ex);
} }
} }
@@ -504,7 +504,7 @@ namespace Disco.Client.Interop
} }
catch (Exception ex) catch (Exception ex)
{ {
throw new Exception("Disco Client was unable to retrieve BaseBoard information from WMI", ex); throw new Exception("Disco ICT Client was unable to retrieve BaseBoard information from WMI", ex);
} }
} }
@@ -556,7 +556,7 @@ namespace Disco.Client.Interop
} }
catch (Exception ex) catch (Exception ex)
{ {
throw new Exception("Disco Client was unable to retrieve ComputerSystemProduct information from WMI", ex); throw new Exception("Disco ICT Client was unable to retrieve ComputerSystemProduct information from WMI", ex);
} }
} }
Disco.Client/Interop/Network.cs
+1 -1
View File
@@ -68,7 +68,7 @@ namespace Disco.Client.Interop
} }
catch (Exception ex) catch (Exception ex)
{ {
throw new Exception("Disco Client was unable to retrieve NetworkAdapter information from WMI", ex); throw new Exception("Disco ICT Client was unable to retrieve NetworkAdapter information from WMI", ex);
} }
} }
Disco.Client/Interop/WirelessNetwork.cs
+3 -3
View File
@@ -61,7 +61,7 @@ namespace Disco.Client.Interop
} }
catch (Exception ex) catch (Exception ex)
{ {
throw new Exception("Disco Client was unable to retrieve Wireless NetworkAdapter information from WlanApi", ex); throw new Exception("Disco ICT Client was unable to retrieve Wireless NetworkAdapter information from WlanApi", ex);
} }
} }
@@ -102,7 +102,7 @@ namespace Disco.Client.Interop
} }
catch (Exception ex) catch (Exception ex)
{ {
throw new Exception("Disco Client was unable to retrieve Wireless Profiles from WlanApi", ex); throw new Exception("Disco ICT Client was unable to retrieve Wireless Profiles from WlanApi", ex);
} }
} }
@@ -356,7 +356,7 @@ namespace Disco.Client.Interop
} }
catch (Exception ex) catch (Exception ex)
{ {
throw new Exception("Disco Client was unable to apply Wireless Profile Changes using WlanApi", ex); throw new Exception("Disco ICT Client was unable to apply Wireless Profile Changes using WlanApi", ex);
} }
} }
Disco.ClientBootstrapper/BootstrapperLoop.cs
+7 -7
View File
@@ -85,12 +85,12 @@ namespace Disco.ClientBootstrapper
// Check for Network Connectivity // Check for Network Connectivity
statusUI.UpdateStatus(null, "Detecting Network", "Checking network connectivity, Please wait...", true, -1); statusUI.UpdateStatus(null, "Detecting Network", "Checking network connectivity, Please wait...", true, -1);
if (!Interop.NetworkInterop.PingDisco(DiscoServerName)) if (!Interop.NetworkInterop.PingDiscoIct(DiscoServerName))
{ {
statusUI.UpdateStatus(null, "Detecting Network", "No network connectivity detected, Diagnosing...", true, -1); statusUI.UpdateStatus(null, "Detecting Network", "No network connectivity detected, Diagnosing...", true, -1);
statusUI_WriteAdapterInfo(); statusUI_WriteAdapterInfo();
if (!Interop.NetworkInterop.PingDisco(DiscoServerName)) if (!Interop.NetworkInterop.PingDiscoIct(DiscoServerName))
{ {
// Check for Wireless // Check for Wireless
var hasWireless = (Interop.NetworkInterop.NetworkAdapters.Count(na => na.IsWireless) > 0); var hasWireless = (Interop.NetworkInterop.NetworkAdapters.Count(na => na.IsWireless) > 0);
@@ -105,17 +105,17 @@ namespace Disco.ClientBootstrapper
statusUI_WriteAdapterInfo(); statusUI_WriteAdapterInfo();
statusUI.UpdateStatus(null, null, null, true, i); statusUI.UpdateStatus(null, null, null, true, i);
Program.SleepThread(500, false); Program.SleepThread(500, false);
if (Interop.NetworkInterop.PingDisco(DiscoServerName)) if (Interop.NetworkInterop.PingDiscoIct(DiscoServerName))
break; break;
} }
if (!Interop.NetworkInterop.PingDisco(DiscoServerName)) if (!Interop.NetworkInterop.PingDiscoIct(DiscoServerName))
{ {
statusUI.UpdateStatus(null, "Wireless Network Failed", "Unable to connect to the wireless network, please connect the network cable...", false); statusUI.UpdateStatus(null, "Wireless Network Failed", "Unable to connect to the wireless network, please connect the network cable...", false);
Program.SleepThread(3000, false); Program.SleepThread(3000, false);
} }
} }
if (!Interop.NetworkInterop.PingDisco(DiscoServerName)) if (!Interop.NetworkInterop.PingDiscoIct(DiscoServerName))
{ {
// Instruct user to connect network cable // Instruct user to connect network cable
statusUI.UpdateStatus(null, "Please connect the network cable", null); statusUI.UpdateStatus(null, "Please connect the network cable", null);
@@ -124,13 +124,13 @@ namespace Disco.ClientBootstrapper
statusUI_WriteAdapterInfo(); statusUI_WriteAdapterInfo();
statusUI.UpdateStatus(null, null, null, true, i); statusUI.UpdateStatus(null, null, null, true, i);
Program.SleepThread(500, false); Program.SleepThread(500, false);
if (Interop.NetworkInterop.PingDisco(DiscoServerName)) if (Interop.NetworkInterop.PingDiscoIct(DiscoServerName))
break; break;
} }
} }
} }
if (!Interop.NetworkInterop.PingDisco(DiscoServerName)) if (!Interop.NetworkInterop.PingDiscoIct(DiscoServerName))
{ {
// Client Failed // Client Failed
if (this.mLoopCompleteCallback != null) if (this.mLoopCompleteCallback != null)
Disco.ClientBootstrapper/BootstrapperWorkstationInstall.vbs
+1 -1
View File
@@ -8,4 +8,4 @@ BootstrapperLocation = Mid(WScript.ScriptFullName, 1, InStrRev(WScript.ScriptFul
Call objShell.Run("""" & BootstrapperLocation & """ /Install", , True) Call objShell.Run("""" & BootstrapperLocation & """ /Install", , True)
WScript.Echo "Disco Client Bootstrapper Installed" WScript.Echo "Disco ICT Client Bootstrapper Installed"
Disco.ClientBootstrapper/FormStatus.Designer.cs
Generated
+2 -2
View File
@@ -85,7 +85,7 @@
this.labelVersion.Name = "labelVersion"; this.labelVersion.Name = "labelVersion";
this.labelVersion.Size = new System.Drawing.Size(167, 20); this.labelVersion.Size = new System.Drawing.Size(167, 20);
this.labelVersion.TabIndex = 0; this.labelVersion.TabIndex = 0;
this.labelVersion.Text = "Disco Bootstrapper v"; this.labelVersion.Text = "Disco ICT Bootstrapper v";
this.labelVersion.TextAlign = System.Drawing.ContentAlignment.TopRight; this.labelVersion.TextAlign = System.Drawing.ContentAlignment.TopRight;
// //
// FormStatus // FormStatus
@@ -106,7 +106,7 @@
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Disco - Client Bootstrapper"; this.Text = "Disco ICT - Client Bootstrapper";
this.TopMost = true; this.TopMost = true;
this.TransparencyKey = System.Drawing.Color.Magenta; this.TransparencyKey = System.Drawing.Color.Magenta;
this.ResumeLayout(false); this.ResumeLayout(false);
Disco.ClientBootstrapper/Interop/NetworkInterop.cs
+1 -1
View File
@@ -165,7 +165,7 @@ namespace Disco.ClientBootstrapper.Interop
} }
} }
public static bool PingDisco(string ServerName) public static bool PingDiscoIct(string ServerName)
{ {
using (Ping p = new Ping()) using (Ping p = new Ping())
{ {
Disco.Data/Repository/DiscoDatabaseConnectionFactory.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace Disco.Data.Repository
var connectionString = DiscoDataContextConnectionString; var connectionString = DiscoDataContextConnectionString;
if (connectionString == null) if (connectionString == null)
{ {
throw new InvalidOperationException("The Disco DataContext Connection String has not been configured"); throw new InvalidOperationException("The Disco ICT DataContext Connection String has not been configured");
} }
// Build DiscoDataContext - Use Default Connection Factory (SQLClient) // Build DiscoDataContext - Use Default Connection Factory (SQLClient)
Disco.Models/Services/Devices/Exporting/DeviceExportOptions.cs
+4 -4
View File
@@ -20,15 +20,15 @@ namespace Disco.Models.Services.Devices.Exporting
public bool DeviceComputerName { get; set; } public bool DeviceComputerName { get; set; }
[Display(ShortName = "Device", Name = "Last Network Logon", Description = "The last recorded time the device access the network")] [Display(ShortName = "Device", Name = "Last Network Logon", Description = "The last recorded time the device access the network")]
public bool DeviceLastNetworkLogon { get; set; } public bool DeviceLastNetworkLogon { get; set; }
[Display(ShortName = "Device", Name = "Created Date", Description = "The date the device was created in Disco")] [Display(ShortName = "Device", Name = "Created Date", Description = "The date the device was created in Disco ICT")]
public bool DeviceCreatedDate { get; set; } public bool DeviceCreatedDate { get; set; }
[Display(ShortName = "Device", Name = "First Enrolled Date", Description = "The date the device was first enrolled in Disco")] [Display(ShortName = "Device", Name = "First Enrolled Date", Description = "The date the device was first enrolled in Disco ICT")]
public bool DeviceFirstEnrolledDate { get; set; } public bool DeviceFirstEnrolledDate { get; set; }
[Display(ShortName = "Device", Name = "Last Enrolled Date", Description = "The date the device was last enrolled in Disco")] [Display(ShortName = "Device", Name = "Last Enrolled Date", Description = "The date the device was last enrolled in Disco ICT")]
public bool DeviceLastEnrolledDate { get; set; } public bool DeviceLastEnrolledDate { get; set; }
[Display(ShortName = "Device", Name = "Enrolment Trusted", Description = "The device is trusted to complete an unauthenticated enrolment")] [Display(ShortName = "Device", Name = "Enrolment Trusted", Description = "The device is trusted to complete an unauthenticated enrolment")]
public bool DeviceAllowUnauthenticatedEnrol { get; set; } public bool DeviceAllowUnauthenticatedEnrol { get; set; }
[Display(ShortName = "Device", Name = "Decommissioned Date", Description = "The date the device was decommissioned in Disco")] [Display(ShortName = "Device", Name = "Decommissioned Date", Description = "The date the device was decommissioned in Disco ICT")]
public bool DeviceDecommissionedDate { get; set; } public bool DeviceDecommissionedDate { get; set; }
[Display(ShortName = "Device", Name = "Decommissioned Reason", Description = "The reason the device was decommissioned")] [Display(ShortName = "Device", Name = "Decommissioned Reason", Description = "The reason the device was decommissioned")]
public bool DeviceDecommissionedReason { get; set; } public bool DeviceDecommissionedReason { get; set; }
Disco.Models/Services/Devices/Importing/DeviceImportFieldTypes.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace Disco.Models.Services.Devices.Importing
DeviceLocation, DeviceLocation,
[Display(Name = "Device Enrolment Trusted", Description = "The device is trusted to complete an unauthenticated enrolment")] [Display(Name = "Device Enrolment Trusted", Description = "The device is trusted to complete an unauthenticated enrolment")]
DeviceAllowUnauthenticatedEnrol, DeviceAllowUnauthenticatedEnrol,
[Display(Name = "Device Decommissioned Date", Description = "The date the device was decommissioned in Disco")] [Display(Name = "Device Decommissioned Date", Description = "The date the device was decommissioned in Disco ICT")]
DeviceDecommissionedDate, DeviceDecommissionedDate,
[Display(Name = "Device Decommissioned Reason", Description = "The reason the device was decommissioned")] [Display(Name = "Device Decommissioned Reason", Description = "The reason the device was decommissioned")]
DeviceDecommissionedReason, DeviceDecommissionedReason,
Disco.Services.Plugins.ManifestGenerator/Program.cs
+6 -6
View File
@@ -25,7 +25,7 @@ namespace Disco.Services.Plugins.ManifestGenerator
throw new ArgumentException($"File not found at: {assemblyFileInfo.FullName}"); throw new ArgumentException($"File not found at: {assemblyFileInfo.FullName}");
} }
Console.WriteLine("Disco Plugin: Generating Manifest"); Console.WriteLine("Disco ICT Plugin: Generating Manifest");
AppDomain.CurrentDomain.AssemblyLoad += CurrentDomain_AssemblyLoad; AppDomain.CurrentDomain.AssemblyLoad += CurrentDomain_AssemblyLoad;
AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
@@ -55,7 +55,7 @@ namespace Disco.Services.Plugins.ManifestGenerator
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine($"Disco Plugin: Warning: Unable to load reference '{referenceAssembly.FullName}'; {ex.Message}"); Console.WriteLine($"Disco ICT Plugin: Warning: Unable to load reference '{referenceAssembly.FullName}'; {ex.Message}");
} }
} }
} }
@@ -68,9 +68,9 @@ namespace Disco.Services.Plugins.ManifestGenerator
File.WriteAllText(manifestFilePath, manifest.ToManifestFile()); File.WriteAllText(manifestFilePath, manifest.ToManifestFile());
Console.WriteLine("Disco Plugin: Manifest Created"); Console.WriteLine("Disco ICT Plugin: Manifest Created");
Console.WriteLine("Disco Plugin: Building Package"); Console.WriteLine("Disco ICT Plugin: Building Package");
var packageFileName = $"{manifest.Id}-{manifest.Version}.discoPlugin"; var packageFileName = $"{manifest.Id}-{manifest.Version}.discoPlugin";
var packageFilePath = Path.Combine(assemblyFileInfo.DirectoryName, packageFileName); var packageFilePath = Path.Combine(assemblyFileInfo.DirectoryName, packageFileName);
@@ -81,7 +81,7 @@ namespace Disco.Services.Plugins.ManifestGenerator
existingPackages.Delete(); existingPackages.Delete();
} }
// Exclude Disco Provided Assemblies // Exclude Disco ICT Provided Assemblies
List<string> excludedFiles = PluginManifest.PluginExcludedAssemblies.ToList(); List<string> excludedFiles = PluginManifest.PluginExcludedAssemblies.ToList();
// Exclude the Package File // Exclude the Package File
@@ -95,7 +95,7 @@ namespace Disco.Services.Plugins.ManifestGenerator
} }
} }
Console.WriteLine($"Disco Plugin: Package Build: '{packageFileName}'"); Console.WriteLine($"Disco ICT Plugin: Package Build: '{packageFileName}'");
} }
Disco.Services/Authorization/AccessDeniedException.cs
+1 -1
View File
@@ -19,7 +19,7 @@ namespace Disco.Services.Authorization
{ {
if (message == null) if (message == null)
{ {
return "Your account does not have the required permission to access this Disco feature."; return "Your account does not have the required permission to access this Disco ICT feature.";
} }
else else
{ {
Disco.Services/Authorization/AuthorizationToken.cs
+1 -1
View File
@@ -44,7 +44,7 @@ namespace Disco.Services.Authorization
#region Token Accessors #region Token Accessors
internal const string RequireAuthenticationMessage = "This feature requires authentication."; internal const string RequireAuthenticationMessage = "This feature requires authentication.";
internal const string RequireDiscoAuthorizationMessage = "Your account does not have the required permission to access this feature. This feature requires your account to be included in at least one Disco Authorization Role."; internal const string RequireDiscoAuthorizationMessage = "Your account does not have the required permission to access this feature. This feature requires your account to be included in at least one Disco ICT Authorization Role.";
internal const string RequireMessageTemplate = "Your account does not have the required permission to access this feature.\r\n"; internal const string RequireMessageTemplate = "Your account does not have the required permission to access this feature.\r\n";
internal const string RequireMessageSingleTemplate = RequireMessageTemplate + "This feature requires the following permission:\r\n- {0}"; internal const string RequireMessageSingleTemplate = RequireMessageTemplate + "This feature requires the following permission:\r\n- {0}";
internal const string RequireAllMessageTemplate = RequireMessageTemplate + "This feature requires permission for:\r\n- {0}"; internal const string RequireAllMessageTemplate = RequireMessageTemplate + "This feature requires permission for:\r\n- {0}";
Disco.Services/Authorization/Claims.cs
+5 -5
View File
@@ -220,14 +220,14 @@ namespace Disco.Services.Authorization
{ "User.ShowFlagAssignments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string, bool>(c => c.User.ShowFlagAssignments, (c, v) => c.User.ShowFlagAssignments = v, "Show Users Flag Assignments", "Can show flags associated with users", false) }, { "User.ShowFlagAssignments", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string, bool>(c => c.User.ShowFlagAssignments, (c, v) => c.User.ShowFlagAssignments = v, "Show Users Flag Assignments", "Can show flags associated with users", false) },
{ "User.ShowJobs", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string, bool>(c => c.User.ShowJobs, (c, v) => c.User.ShowJobs = v, "Show Users Jobs", "Can show jobs associated with users", false) }, { "User.ShowJobs", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string, bool>(c => c.User.ShowJobs, (c, v) => c.User.ShowJobs = v, "Show Users Jobs", "Can show jobs associated with users", false) },
{ "ComputerAccount", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string, bool>(c => c.ComputerAccount, (c, v) => c.ComputerAccount = v, "Computer Account", "Represents a computer account", true) }, { "ComputerAccount", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string, bool>(c => c.ComputerAccount, (c, v) => c.ComputerAccount = v, "Computer Account", "Represents a computer account", true) },
{ "DiscoAdminAccount", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string, bool>(c => c.DiscoAdminAccount, (c, v) => c.DiscoAdminAccount = v, "Disco Administrator Account", "Represents a Disco Administrator account", true) } { "DiscoAdminAccount", new Tuple<Func<RoleClaims, bool>, Action<RoleClaims, bool>, string, string, bool>(c => c.DiscoAdminAccount, (c, v) => c.DiscoAdminAccount = v, "Disco ICT Administrator Account", "Represents a Disco ICT Administrator account", true) }
}; };
#endregion #endregion
#region Role Claim Navigator #region Role Claim Navigator
_claimNavigator = _claimNavigator =
new ClaimNavigatorItem("Claims", "Permissions", "Top-level node for all permissions", false, new List<IClaimNavigatorItem>() { new ClaimNavigatorItem("Claims", "Permissions", "Top-level node for all permissions", false, new List<IClaimNavigatorItem>() {
new ClaimNavigatorItem("Config", "Configuration", "Permissions related to Disco Configuration", false, new List<IClaimNavigatorItem>() { new ClaimNavigatorItem("Config", "Configuration", "Permissions related to Disco ICT Configuration", false, new List<IClaimNavigatorItem>() {
new ClaimNavigatorItem("Config.DeviceBatch", "Device Batches", "Permissions related to Device Batches", false, new List<IClaimNavigatorItem>() { new ClaimNavigatorItem("Config.DeviceBatch", "Device Batches", "Permissions related to Device Batches", false, new List<IClaimNavigatorItem>() {
new ClaimNavigatorItem("Config.DeviceBatch.Configure", false), new ClaimNavigatorItem("Config.DeviceBatch.Configure", false),
new ClaimNavigatorItem("Config.DeviceBatch.Create", false), new ClaimNavigatorItem("Config.DeviceBatch.Create", false),
@@ -749,7 +749,7 @@ namespace Disco.Services.Authorization
#region Role Claim Constants #region Role Claim Constants
/// <summary>Configuration /// <summary>Configuration
/// <para>Permissions related to Disco Configuration</para> /// <para>Permissions related to Disco ICT Configuration</para>
/// </summary> /// </summary>
public static class Config public static class Config
{ {
@@ -1917,8 +1917,8 @@ namespace Disco.Services.Authorization
/// </summary> /// </summary>
public const string ComputerAccount = "ComputerAccount"; public const string ComputerAccount = "ComputerAccount";
/// <summary>Disco Administrator Account /// <summary>Disco ICT Administrator Account
/// <para>Represents a Disco Administrator account</para> /// <para>Represents a Disco ICT Administrator account</para>
/// </summary> /// </summary>
public const string DiscoAdminAccount = "DiscoAdminAccount"; public const string DiscoAdminAccount = "DiscoAdminAccount";
#endregion #endregion
Disco.Services/Authorization/Roles/ClaimGroups/Configuration/ConfigClaims.cs
+1 -1
View File
@@ -14,7 +14,7 @@ using Disco.Services.Authorization.Roles.ClaimGroups.Configuration.UserFlag;
namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration namespace Disco.Services.Authorization.Roles.ClaimGroups.Configuration
{ {
[ClaimDetails("Configuration", "Permissions related to Disco Configuration")] [ClaimDetails("Configuration", "Permissions related to Disco ICT Configuration")]
public class ConfigClaims : BaseRoleClaimGroup public class ConfigClaims : BaseRoleClaimGroup
{ {
public ConfigClaims() public ConfigClaims()
Disco.Services/Authorization/Roles/RoleCache.cs
+1 -1
View File
@@ -149,7 +149,7 @@ namespace Disco.Services.Authorization.Roles
} }
/// <summary> /// <summary>
/// Migrates authorization role claims to conform with changes to Disco since the last release. /// Migrates authorization role claims to conform with changes to Disco ICT since the last release.
/// Claims are only added when the meaning of an existing claim has changed (or expanded/contracted) to improve the migration experience. /// Claims are only added when the meaning of an existing claim has changed (or expanded/contracted) to improve the migration experience.
/// </summary> /// </summary>
private static void MigrateAuthorizationRoles(DiscoDataContext Database) private static void MigrateAuthorizationRoles(DiscoDataContext Database)
Disco.Services/Authorization/Roles/RoleClaims.cs
+1 -1
View File
@@ -19,7 +19,7 @@ namespace Disco.Services.Authorization.Roles
[ClaimDetails("Computer Account", "Represents a computer account", true)] [ClaimDetails("Computer Account", "Represents a computer account", true)]
public bool ComputerAccount { get; set; } public bool ComputerAccount { get; set; }
[ClaimDetails("Disco Administrator Account", "Represents a Disco Administrator account", true)] [ClaimDetails("Disco Administrator Account", "Represents a Disco ICT Administrator account", true)]
public bool DiscoAdminAccount { get; set; } public bool DiscoAdminAccount { get; set; }
public ConfigClaims Config { get; set; } public ConfigClaims Config { get; set; }
Disco.Services/Devices/Enrolment/DeviceEnrolment.cs
+2 -2
View File
@@ -140,7 +140,7 @@ namespace Disco.Services.Devices.Enrolment
} }
} }
EnrolmentLog.LogSessionProgress(sessionId, 100, "Disconnected, Starting Disco Enrolment"); EnrolmentLog.LogSessionProgress(sessionId, 100, "Disconnected, Starting Disco ICT Enrolment");
MacSecureEnrolResponse response = MacSecureEnrolResponse.FromMacEnrolResponse(MacEnrol(Database, trustedRequest, true, sessionId)); MacSecureEnrolResponse response = MacSecureEnrolResponse.FromMacEnrolResponse(MacEnrol(Database, trustedRequest, true, sessionId));
EnrolmentLog.LogSessionFinished(sessionId); EnrolmentLog.LogSessionFinished(sessionId);
MacSecureEnrol = response; MacSecureEnrol = response;
@@ -330,7 +330,7 @@ namespace Disco.Services.Devices.Enrolment
EnrolmentLog.LogSessionProgress(sessionId, 13, "Loading Device Data"); EnrolmentLog.LogSessionProgress(sessionId, 13, "Loading Device Data");
Device RepoDevice = Database.Devices.Include("AssignedUser").Include("DeviceModel").Include("DeviceProfile").Where(d => d.SerialNumber == Request.SerialNumber).FirstOrDefault(); Device RepoDevice = Database.Devices.Include("AssignedUser").Include("DeviceModel").Include("DeviceProfile").Where(d => d.SerialNumber == Request.SerialNumber).FirstOrDefault();
EnrolmentLog.LogSessionProgress(sessionId, 15, "Discovering User/Device Disco Permissions"); EnrolmentLog.LogSessionProgress(sessionId, 15, "Discovering User/Device Disco ICT Permissions");
if (isAuthenticated) if (isAuthenticated)
{ {
if (!authenticatedToken.Has(Claims.Device.Actions.EnrolDevices)) if (!authenticatedToken.Has(Claims.Device.Actions.EnrolDevices))
Disco.Services/Devices/Enrolment/EnrolmentLog.cs
+2 -2
View File
@@ -408,7 +408,7 @@ namespace Disco.Services.Devices.Enrolment
Id = (int)EventTypeIds.SessionTaskAddedDevice, Id = (int)EventTypeIds.SessionTaskAddedDevice,
ModuleId = _ModuleId, ModuleId = _ModuleId,
Name = "Task - Added Device", Name = "Task - Added Device",
Format = "Creating Disco Device {1}", Format = "Creating Disco ICT Device {1}",
Severity = 0, Severity = 0,
UseLive = true, UseLive = true,
UsePersist = true, UsePersist = true,
@@ -419,7 +419,7 @@ namespace Disco.Services.Devices.Enrolment
Id = (int)EventTypeIds.SessionTaskUpdatingDevice, Id = (int)EventTypeIds.SessionTaskUpdatingDevice,
ModuleId = _ModuleId, ModuleId = _ModuleId,
Name = "Task - Updating Device", Name = "Task - Updating Device",
Format = "Updating Disco Device {1}", Format = "Updating Disco ICT Device {1}",
Severity = 0, Severity = 0,
UseLive = true, UseLive = true,
UsePersist = true, UsePersist = true,
Disco.Services/Expressions/Extensions/DataExt.cs
+1 -1
View File
@@ -13,7 +13,7 @@ namespace Disco.Services.Expressions.Extensions
private static SqlConnection BuildSqlConnection(string Server, string Database, string Username, string Password) private static SqlConnection BuildSqlConnection(string Server, string Database, string Username, string Password)
{ {
var dbConnectionStringBuilder = new SqlConnectionStringBuilder(); var dbConnectionStringBuilder = new SqlConnectionStringBuilder();
dbConnectionStringBuilder.ApplicationName = "Disco"; dbConnectionStringBuilder.ApplicationName = "Disco ICT";
dbConnectionStringBuilder.DataSource = Server; dbConnectionStringBuilder.DataSource = Server;
dbConnectionStringBuilder.InitialCatalog = Database; dbConnectionStringBuilder.InitialCatalog = Database;
dbConnectionStringBuilder.MultipleActiveResultSets = true; dbConnectionStringBuilder.MultipleActiveResultSets = true;
Disco.Services/Interop/ActiveDirectory/ADDomainController.cs
+1 -1
View File
@@ -340,7 +340,7 @@ namespace Disco.Services.Interop.ActiveDirectory
public string OfflineDomainJoinProvision(string ComputerSamAccountName, string OrganisationalUnit, ref ADMachineAccount MachineAccount, out string DiagnosticInformation) public string OfflineDomainJoinProvision(string ComputerSamAccountName, string OrganisationalUnit, ref ADMachineAccount MachineAccount, out string DiagnosticInformation)
{ {
if (MachineAccount != null && MachineAccount.IsCriticalSystemObject) if (MachineAccount != null && MachineAccount.IsCriticalSystemObject)
throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", MachineAccount.DistinguishedName)); throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", MachineAccount.DistinguishedName));
if (!IsWritable) if (!IsWritable)
throw new InvalidOperationException(string.Format("The domain controller [{0}] is not writable. This action (Offline Domain Join Provision) requires a writable domain controller.", Name)); throw new InvalidOperationException(string.Format("The domain controller [{0}] is not writable. This action (Offline Domain Join Provision) requires a writable domain controller.", Name));
Disco.Services/Interop/ActiveDirectory/ADMachineAccount.cs
+5 -5
View File
@@ -227,7 +227,7 @@ namespace Disco.Services.Interop.ActiveDirectory
private void SetNetbootGUID(ADDomainController WritableDomainController, Guid updatedNetbootGUID) private void SetNetbootGUID(ADDomainController WritableDomainController, Guid updatedNetbootGUID)
{ {
if (IsCriticalSystemObject) if (IsCriticalSystemObject)
throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", DistinguishedName)); throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
if (NetbootGUID != updatedNetbootGUID) if (NetbootGUID != updatedNetbootGUID)
{ {
@@ -248,7 +248,7 @@ namespace Disco.Services.Interop.ActiveDirectory
public void SetDescription(ADDomainController WritableDomainController, string Description) public void SetDescription(ADDomainController WritableDomainController, string Description)
{ {
if (IsCriticalSystemObject) if (IsCriticalSystemObject)
throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", DistinguishedName)); throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
if (this.Description != Description) if (this.Description != Description)
{ {
@@ -349,7 +349,7 @@ namespace Disco.Services.Interop.ActiveDirectory
public void EnableAccount(ADDomainController WritableDomainController) public void EnableAccount(ADDomainController WritableDomainController)
{ {
if (IsCriticalSystemObject) if (IsCriticalSystemObject)
throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", DistinguishedName)); throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
if (IsDisabled) if (IsDisabled)
{ {
@@ -377,7 +377,7 @@ namespace Disco.Services.Interop.ActiveDirectory
public bool UpdateNetbootGUID(ADDomainController WritableDomainController, string UUID, string MACAddress) public bool UpdateNetbootGUID(ADDomainController WritableDomainController, string UUID, string MACAddress)
{ {
if (IsCriticalSystemObject) if (IsCriticalSystemObject)
throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", DistinguishedName)); throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
Guid netbootGUID = Guid.Empty; Guid netbootGUID = Guid.Empty;
@@ -428,7 +428,7 @@ namespace Disco.Services.Interop.ActiveDirectory
public void MoveOrganisationalUnit(ADDomainController WritableDomainController, string NewOrganisationUnit) public void MoveOrganisationalUnit(ADDomainController WritableDomainController, string NewOrganisationUnit)
{ {
if (IsCriticalSystemObject) if (IsCriticalSystemObject)
throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", DistinguishedName)); throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
var parentDistinguishedName = ParentDistinguishedName; var parentDistinguishedName = ParentDistinguishedName;
Disco.Services/Interop/ActiveDirectory/ADUserAccount.cs
+6 -6
View File
@@ -296,7 +296,7 @@ namespace Disco.Services.Interop.ActiveDirectory
public void EnableAccount(ADDomainController WritableDomainController) public void EnableAccount(ADDomainController WritableDomainController)
{ {
if (IsCriticalSystemObject) if (IsCriticalSystemObject)
throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", DistinguishedName)); throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
if (IsDisabled) if (IsDisabled)
{ {
@@ -324,7 +324,7 @@ namespace Disco.Services.Interop.ActiveDirectory
public void SetDisplayName(ADDomainController WritableDomainController, string DisplayName) public void SetDisplayName(ADDomainController WritableDomainController, string DisplayName)
{ {
if (IsCriticalSystemObject) if (IsCriticalSystemObject)
throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", DistinguishedName)); throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
if (this.DisplayName != DisplayName) if (this.DisplayName != DisplayName)
{ {
@@ -357,7 +357,7 @@ namespace Disco.Services.Interop.ActiveDirectory
public void SetSurname(ADDomainController WritableDomainController, string Surname) public void SetSurname(ADDomainController WritableDomainController, string Surname)
{ {
if (IsCriticalSystemObject) if (IsCriticalSystemObject)
throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", DistinguishedName)); throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
if (this.Surname != Surname) if (this.Surname != Surname)
{ {
@@ -390,7 +390,7 @@ namespace Disco.Services.Interop.ActiveDirectory
public void SetGivenName(ADDomainController WritableDomainController, string GivenName) public void SetGivenName(ADDomainController WritableDomainController, string GivenName)
{ {
if (IsCriticalSystemObject) if (IsCriticalSystemObject)
throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", DistinguishedName)); throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
if (this.GivenName != GivenName) if (this.GivenName != GivenName)
{ {
@@ -423,7 +423,7 @@ namespace Disco.Services.Interop.ActiveDirectory
public void SetEmail(ADDomainController WritableDomainController, string Email) public void SetEmail(ADDomainController WritableDomainController, string Email)
{ {
if (IsCriticalSystemObject) if (IsCriticalSystemObject)
throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", DistinguishedName)); throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
if (this.Email != Email) if (this.Email != Email)
{ {
@@ -456,7 +456,7 @@ namespace Disco.Services.Interop.ActiveDirectory
public void SetPhone(ADDomainController WritableDomainController, string Phone) public void SetPhone(ADDomainController WritableDomainController, string Phone)
{ {
if (IsCriticalSystemObject) if (IsCriticalSystemObject)
throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco refuses to modify it", DistinguishedName)); throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
if (this.Phone != Phone) if (this.Phone != Phone)
{ {
Disco.Services/Interop/ActiveDirectory/ActiveDirectoryManagedGroups.cs
+3 -3
View File
@@ -80,7 +80,7 @@ namespace Disco.Services.Interop.ActiveDirectory
if (group == null) if (group == null)
throw new ArgumentException(string.Format("The group [{0}] wasn't found", GroupId), "DevicesLinkedGroup"); throw new ArgumentException(string.Format("The group [{0}] wasn't found", GroupId), "DevicesLinkedGroup");
if (group.GetPropertyValue<bool>("isCriticalSystemObject")) if (group.GetPropertyValue<bool>("isCriticalSystemObject"))
throw new ArgumentException(string.Format("The group [{0}] is a Critical System Active Directory Object and Disco refuses to modify it", group.DistinguishedName), "DevicesLinkedGroup"); throw new ArgumentException(string.Format("The group [{0}] is a Critical System Active Directory Object and Disco ICT refuses to modify it", group.DistinguishedName), "DevicesLinkedGroup");
GroupId = group.Id; GroupId = group.Id;
@@ -219,7 +219,7 @@ namespace Disco.Services.Interop.ActiveDirectory
using (var adGroupEntry = ActiveDirectory.Context.RetrieveDirectoryEntry(adGroup.DistinguishedName, new string[] { "member", "isCriticalSystemObject" })) using (var adGroupEntry = ActiveDirectory.Context.RetrieveDirectoryEntry(adGroup.DistinguishedName, new string[] { "member", "isCriticalSystemObject" }))
{ {
if (adGroupEntry.Entry.Properties.Value<bool>("isCriticalSystemObject")) if (adGroupEntry.Entry.Properties.Value<bool>("isCriticalSystemObject"))
throw new InvalidOperationException(string.Format("This group [{0}] is a Critical System Active Directory Object and Disco refuses to modify it", adGroup.DistinguishedName)); throw new InvalidOperationException(string.Format("This group [{0}] is a Critical System Active Directory Object and Disco ICT refuses to modify it", adGroup.DistinguishedName));
var adGroupEntryMembers = adGroupEntry.Entry.Properties["member"]; var adGroupEntryMembers = adGroupEntry.Entry.Properties["member"];
foreach (var item in actionItems) foreach (var item in actionItems)
@@ -369,7 +369,7 @@ namespace Disco.Services.Interop.ActiveDirectory
using (var adGroupEntry = ActiveDirectory.Context.RetrieveDirectoryEntry(adGroup.DistinguishedName, new string[] { "isCriticalSystemObject", "description", "member" })) using (var adGroupEntry = ActiveDirectory.Context.RetrieveDirectoryEntry(adGroup.DistinguishedName, new string[] { "isCriticalSystemObject", "description", "member" }))
{ {
if (adGroupEntry.Entry.Properties.Value<bool>("isCriticalSystemObject")) if (adGroupEntry.Entry.Properties.Value<bool>("isCriticalSystemObject"))
throw new InvalidOperationException(string.Format("This group [{0}] is a Critical System Active Directory Object and Disco refuses to modify it", adGroup.DistinguishedName)); throw new InvalidOperationException(string.Format("This group [{0}] is a Critical System Active Directory Object and Disco ICT refuses to modify it", adGroup.DistinguishedName));
// Update Description // Update Description
var groupDescription = string.Format("Disco ICT: {0}", actionGroup.Item1.GroupDescription); var groupDescription = string.Format("Disco ICT: {0}", actionGroup.Item1.GroupDescription);
Disco.Services/Jobs/JobExtensions.cs
+1 -1
View File
@@ -262,7 +262,7 @@ namespace Disco.Services
public static string GenerateFaultDescriptionFooter(this Job j, DiscoDataContext Database, PluginFeatureManifest WarrantyProviderDefinition) public static string GenerateFaultDescriptionFooter(this Job j, DiscoDataContext Database, PluginFeatureManifest WarrantyProviderDefinition)
{ {
var versionDisco = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; var versionDisco = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
return string.Format("Automation by Disco v{0}.{1}.{2:0000}.{3:0000} (Provider: {4} v{5})", return string.Format("Automation by Disco ICT v{0}.{1}.{2:0000}.{3:0000} (Provider: {4} v{5})",
versionDisco.Major, versionDisco.Minor, versionDisco.Build, versionDisco.Revision, WarrantyProviderDefinition.Id, WarrantyProviderDefinition.PluginManifest.Version.ToString(4)); versionDisco.Major, versionDisco.Minor, versionDisco.Build, versionDisco.Revision, WarrantyProviderDefinition.Id, WarrantyProviderDefinition.PluginManifest.Version.ToString(4));
} }
Disco.Services/Logging/SystemLog.cs
+1 -1
View File
@@ -148,7 +148,7 @@ namespace Disco.Services.Logging
Id = (int)EventTypeIds.Uninitialized, Id = (int)EventTypeIds.Uninitialized,
ModuleId = _ModuleId, ModuleId = _ModuleId,
Name = "Disco Uninitialized", Name = "Disco Uninitialized",
Format = "Disco Uninitialized", Format = "Disco ICT Uninitialized",
Severity = (int)LogEventType.Severities.Information, Severity = (int)LogEventType.Severities.Information,
UseLive = false, UsePersist = true, UseDisplay = false } UseLive = false, UsePersist = true, UseDisplay = false }
}; };
Disco.Services/Plugins/Features/UIExtension/UIExtensions.cs
+2 -2
View File
@@ -52,7 +52,7 @@ namespace Disco.Services.Plugins.Features.UIExtension
if (uiExtResults != null && uiExtResults.Count > 0) if (uiExtResults != null && uiExtResults.Count > 0)
{ {
page.WriteLiteral("<!-- BEGIN: Disco UI Extensions -->"); page.WriteLiteral("<!-- BEGIN: Disco ICT UI Extensions -->");
page.WriteLiteral("\n<div id=\"layout_uiExtensions\">"); page.WriteLiteral("\n<div id=\"layout_uiExtensions\">");
foreach (var uiExtResult in uiExtResults) foreach (var uiExtResult in uiExtResults)
{ {
@@ -62,7 +62,7 @@ namespace Disco.Services.Plugins.Features.UIExtension
page.WriteLiteral(string.Format("\n<!-- END UI EXTENSION: {0} -->", extensionDescription)); page.WriteLiteral(string.Format("\n<!-- END UI EXTENSION: {0} -->", extensionDescription));
} }
page.WriteLiteral("\n</div>"); page.WriteLiteral("\n</div>");
page.WriteLiteral("\n<!-- END: Disco UI Extensions -->"); page.WriteLiteral("\n<!-- END: Disco ICT UI Extensions -->");
} }
} }
Disco.Services/Plugins/Plugins.cs
+2 -2
View File
@@ -314,9 +314,9 @@ namespace Disco.Services.Plugins
throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] is not compatible: {2}", pluginManifest.Id, pluginManifest.VersionFormatted, pluginIncompatible.Reason)); throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] is not compatible: {2}", pluginManifest.Id, pluginManifest.VersionFormatted, pluginIncompatible.Reason));
if (pluginManifest.HostVersionMin != null && pluginManifest.HostVersionMin > hostVersion) if (pluginManifest.HostVersionMin != null && pluginManifest.HostVersionMin > hostVersion)
throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] does not support this version of Disco (Requires v{2} or greater)", pluginManifest.Id, pluginManifest.VersionFormatted, pluginManifest.HostVersionMin.ToString())); throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] does not support this version of Disco ICT (Requires v{2} or greater)", pluginManifest.Id, pluginManifest.VersionFormatted, pluginManifest.HostVersionMin.ToString()));
if (pluginManifest.HostVersionMax != null && pluginManifest.HostVersionMax < hostVersion) if (pluginManifest.HostVersionMax != null && pluginManifest.HostVersionMax < hostVersion)
throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] does not support this version of Disco (Support expired as of v{2})", pluginManifest.Id, pluginManifest.VersionFormatted, pluginManifest.HostVersionMax.ToString())); throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] does not support this version of Disco ICT (Support expired as of v{2})", pluginManifest.Id, pluginManifest.VersionFormatted, pluginManifest.HostVersionMax.ToString()));
RegisterPluginAssemblyReferences(pluginManifest); RegisterPluginAssemblyReferences(pluginManifest);
Disco.Services/Plugins/UninstallPluginTask.cs
+1 -1
View File
@@ -45,7 +45,7 @@ namespace Disco.Services.Plugins
File.Copy(manifestUninstallFileLocation, manifestDataUninstallFileLocation); File.Copy(manifestUninstallFileLocation, manifestDataUninstallFileLocation);
} }
Status.Finished("Restarting Disco, please wait...", "/Config/Plugins"); Status.Finished("Restarting Disco ICT, please wait...", "/Config/Plugins");
Plugins.RestartApp(2500); Plugins.RestartApp(2500);
} }
Disco.Services/Plugins/UpdatePluginTask.cs
+1 -1
View File
@@ -88,7 +88,7 @@ namespace Disco.Services.Plugins
ExecuteTaskInternal(Status, pluginPackagesLocation, updatePlugins); ExecuteTaskInternal(Status, pluginPackagesLocation, updatePlugins);
Status.Finished("Restarting Disco, please wait...", "/Config/Plugins"); Status.Finished("Restarting Disco ICT, please wait...", "/Config/Plugins");
Plugins.RestartApp(2500); Plugins.RestartApp(2500);
} }
Disco.Services/Plugins/UpdatePluginsAfterDiscoUpdateTask.cs
+3 -3
View File
@@ -10,11 +10,11 @@ namespace Disco.Services.Plugins
{ {
private static object _startLock = new object(); private static object _startLock = new object();
public override string TaskName { get { return "Updating Disco Plugins"; } } public override string TaskName { get { return "Updating Disco ICT Plugins"; } }
protected override void ExecuteTask() protected override void ExecuteTask()
{ {
Status.UpdateStatus(0, "Updating plugins after Disco update", "Starting, please wait..."); Status.UpdateStatus(0, "Updating plugins after Disco ICT update", "Starting, please wait...");
// Wait for App to Load (10 Seconds) // Wait for App to Load (10 Seconds)
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
@@ -33,7 +33,7 @@ namespace Disco.Services.Plugins
UpdatePluginTask.UpdateOffline(Status); UpdatePluginTask.UpdateOffline(Status);
// Restart // Restart
Status.Finished("Restarting Disco, please wait...", "/"); Status.Finished("Restarting Disco ICT, please wait...", "/");
Plugins.RestartApp(2500); Plugins.RestartApp(2500);
} }
Disco.Web/Areas/Config/Views/AuthorizationRole/Index.cshtml
+1 -1
View File
@@ -223,6 +223,6 @@ else
</script> </script>
<!-- #endregion --> <!-- #endregion -->
<div class="actionBar"> <div class="actionBar">
<a id="Config_AuthRoles_UpdateAdministrators" href="#" class="button">Update Disco Administrators [@Model.AdministratorSubjects.Count]</a> <a id="Config_AuthRoles_UpdateAdministrators" href="#" class="button">Update Disco ICT Administrators [@Model.AdministratorSubjects.Count]</a>
@Html.ActionLinkButton("Create Authorization Role", MVC.Config.AuthorizationRole.Create()) @Html.ActionLinkButton("Create Authorization Role", MVC.Config.AuthorizationRole.Create())
</div> </div>
Disco.Web/Areas/Config/Views/AuthorizationRole/Index.generated.cs
+3 -4
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34014 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Areas.Config.Views.AuthorizationRole
using System.Web.UI; using System.Web.UI;
using System.Web.WebPages; using System.Web.WebPages;
using Disco; using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services; using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
@@ -469,11 +468,11 @@ WriteLiteral(" href=\"#\"");
WriteLiteral(" class=\"button\""); WriteLiteral(" class=\"button\"");
WriteLiteral(">Update Disco Administrators ["); WriteLiteral(">Update Disco ICT Administrators [");
#line 226 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml" #line 226 "..\..\Areas\Config\Views\AuthorizationRole\Index.cshtml"
Write(Model.AdministratorSubjects.Count); Write(Model.AdministratorSubjects.Count);
#line default #line default
Disco.Web/Areas/Config/Views/Config/Index.cshtml
+2 -2
View File
@@ -28,7 +28,7 @@
{ {
<i class="fa fa-cog"></i>@Html.ActionLinkClass("Plugins", MVC.Config.Plugins.Index(), "config") <i class="fa fa-cog"></i>@Html.ActionLinkClass("Plugins", MVC.Config.Plugins.Index(), "config")
<div class="pageMenuBlurb"> <div class="pageMenuBlurb">
Manage extensions to the Disco platform. Manage extensions to the Disco ICT platform.
</div> </div>
} }
@if (Authorization.Has(Claims.DiscoAdminAccount)) @if (Authorization.Has(Claims.DiscoAdminAccount))
@@ -42,7 +42,7 @@
{ {
<i class="fa fa-cog"></i>@Html.ActionLinkClass("Logging", MVC.Config.Logging.Index(), "config") <i class="fa fa-cog"></i>@Html.ActionLinkClass("Logging", MVC.Config.Logging.Index(), "config")
<div class="pageMenuBlurb"> <div class="pageMenuBlurb">
Export Log files from various Disco Modules and view Live Logging. Export Log files from various Disco ICT Modules and view Live Logging.
</div> </div>
} }
</div> </div>
Disco.Web/Areas/Config/Views/Config/Index.generated.cs
+8 -9
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34014 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Areas.Config.Views.Config
using System.Web.UI; using System.Web.UI;
using System.Web.WebPages; using System.Web.WebPages;
using Disco; using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services; using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
@@ -223,8 +222,8 @@ WriteLiteral(" <div");
WriteLiteral(" class=\"pageMenuBlurb\""); WriteLiteral(" class=\"pageMenuBlurb\"");
WriteLiteral(">\r\n Manage extensions to the Disco platform.\r\n " + WriteLiteral(">\r\n Manage extensions to the Disco ICT platform.\r\n " +
" </div>\r\n"); " </div>\r\n");
#line 33 "..\..\Areas\Config\Views\Config\Index.cshtml" #line 33 "..\..\Areas\Config\Views\Config\Index.cshtml"
@@ -323,8 +322,8 @@ WriteLiteral(" <div");
WriteLiteral(" class=\"pageMenuBlurb\""); WriteLiteral(" class=\"pageMenuBlurb\"");
WriteLiteral(">\r\n Export Log files from various Disco Modules and vi" + WriteLiteral(">\r\n Export Log files from various Disco ICT Modules an" +
"ew Live Logging.\r\n </div>\r\n"); "d view Live Logging.\r\n </div>\r\n");
#line 47 "..\..\Areas\Config\Views\Config\Index.cshtml" #line 47 "..\..\Areas\Config\Views\Config\Index.cshtml"
@@ -912,14 +911,14 @@ WriteLiteral(" class=\"fa fa-cloud-download info\"");
WriteLiteral("></i>\r\n <div>An updated version of Disco is available</div>\r\n <a"); WriteLiteral("></i>\r\n <div>An updated version of Disco is available</div>\r\n <a");
WriteAttribute("href", Tuple.Create(" href=\"", 7810), Tuple.Create("\"", 7846) WriteAttribute("href", Tuple.Create(" href=\"", 7818), Tuple.Create("\"", 7854)
#line 148 "..\..\Areas\Config\Views\Config\Index.cshtml" #line 148 "..\..\Areas\Config\Views\Config\Index.cshtml"
, Tuple.Create(Tuple.Create("", 7817), Tuple.Create<System.Object, System.Int32>(Model.UpdateResponse.UrlLink , Tuple.Create(Tuple.Create("", 7825), Tuple.Create<System.Object, System.Int32>(Model.UpdateResponse.UrlLink
#line default #line default
#line hidden #line hidden
, 7817), false) , 7825), false)
); );
WriteLiteral(" class=\"button small alert\""); WriteLiteral(" class=\"button small alert\"");
Disco.Web/Areas/Config/Views/DocumentTemplate/ExpressionBrowser.cshtml
+1 -1
View File
@@ -7,7 +7,7 @@
Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-DynaTree"); Html.BundleDeferred("~/ClientScripts/Modules/jQueryUI-DynaTree");
} }
<div id="configurationDocumentTemplateExpressionBrowser"> <div id="configurationDocumentTemplateExpressionBrowser">
Expressions within Disco are based on the <a href="http://www.springframework.net/" Expressions within Disco ICT are based on the <a href="http://www.springframework.net/"
target="_blank">Spring.NET Framework</a>. Please refer to the <a href="http://www.springframework.net/doc-latest/reference/html/expressions.html" target="_blank">Spring.NET Framework</a>. Please refer to the <a href="http://www.springframework.net/doc-latest/reference/html/expressions.html"
target="_blank">Expression Evaluation</a> documentation. target="_blank">Expression Evaluation</a> documentation.
<h2 id="DeviceScope"> <h2 id="DeviceScope">
Disco.Web/Areas/Config/Views/DocumentTemplate/ExpressionBrowser2.generated.cs
+2 -3
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34014 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
using System.Web.UI; using System.Web.UI;
using System.Web.WebPages; using System.Web.WebPages;
using Disco; using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services; using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
@@ -60,7 +59,7 @@ WriteLiteral("\r\n<div");
WriteLiteral(" id=\"configurationDocumentTemplateExpressionBrowser\""); WriteLiteral(" id=\"configurationDocumentTemplateExpressionBrowser\"");
WriteLiteral(">\r\n Expressions within Disco are based on the <a"); WriteLiteral(">\r\n Expressions within Disco ICT are based on the <a");
WriteLiteral(" href=\"http://www.springframework.net/\""); WriteLiteral(" href=\"http://www.springframework.net/\"");
Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.cshtml
+1 -1
View File
@@ -34,7 +34,7 @@
<div class="sessionPageDetails"> <div class="sessionPageDetails">
<h3 data-bind="text: title"></h3> <h3 data-bind="text: title"></h3>
<div data-bind="visible: undetected"> <div data-bind="visible: undetected">
Disco QR-Code not found<br /> Disco ICT QR-Code not found<br />
<a target="_blank" href="#" data-bind="attr: { href: manuallyAssignUrl }, visible: $parent.sessionEnded">Manually Assign Page</a> <a target="_blank" href="#" data-bind="attr: { href: manuallyAssignUrl }, visible: $parent.sessionEnded">Manually Assign Page</a>
</div> </div>
<div data-bind="visible: detected"> <div data-bind="visible: detected">
Disco.Web/Areas/Config/Views/DocumentTemplate/ImportStatus.generated.cs
+2 -3
View File
@@ -27,7 +27,6 @@ namespace Disco.Web.Areas.Config.Views.DocumentTemplate
using System.Web.UI; using System.Web.UI;
using System.Web.WebPages; using System.Web.WebPages;
using Disco; using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services; using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
@@ -139,8 +138,8 @@ WriteLiteral("></h3>\r\n <div");
WriteLiteral(" data-bind=\"visible: undetected\""); WriteLiteral(" data-bind=\"visible: undetected\"");
WriteLiteral(">\r\n Disco QR-Code not found<br />\r\n " + WriteLiteral(">\r\n Disco ICT QR-Code not found<br />\r\n " +
" <a"); " <a");
WriteLiteral(" target=\"_blank\""); WriteLiteral(" target=\"_blank\"");
Disco.Web/Areas/Config/Views/Plugins/Install.cshtml
+2 -2
View File
@@ -71,7 +71,7 @@
<div class="info-box"> <div class="info-box">
<p class="fa-p"> <p class="fa-p">
<i class="fa fa-exclamation-triangle"></i><strong>Warning:</strong> All plugins run with the same level of network privileges as the Disco Web App.<br /> <i class="fa fa-exclamation-triangle"></i><strong>Warning:</strong> All plugins run with the same level of network privileges as the Disco ICT Web App.<br />
<strong>Only Install plugins from a trusted source.</strong> <strong>Only Install plugins from a trusted source.</strong>
</p> </p>
</div> </div>
@@ -88,7 +88,7 @@
</div> </div>
<div class="info-box error"> <div class="info-box error">
<p class="fa-p"> <p class="fa-p">
<i class="fa fa-exclamation-triangle"></i><strong>Warning:</strong> All plugins run with the same level of network privileges as the Disco Web App.<br /> <i class="fa fa-exclamation-triangle"></i><strong>Warning:</strong> All plugins run with the same level of network privileges as the Disco ICT Web App.<br />
<strong>Only install plugins from a trusted source.</strong> <strong>Only install plugins from a trusted source.</strong>
</p> </p>
</div> </div>
Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs
+5 -5
View File
@@ -413,8 +413,8 @@ WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-exclamation-triangle\""); WriteLiteral(" class=\"fa fa-exclamation-triangle\"");
WriteLiteral("></i><strong>Warning:</strong> All plugins run with the same level of network pri" + WriteLiteral("></i><strong>Warning:</strong> All plugins run with the same level of network pri" +
"vileges as the Disco Web App.<br />\r\n <strong>Only Install plugins fr" + "vileges as the Disco ICT Web App.<br />\r\n <strong>Only Install plugin" +
"om a trusted source.</strong>\r\n </p>\r\n </div>\r\n</div>\r\n"); "s from a trusted source.</strong>\r\n </p>\r\n </div>\r\n</div>\r\n");
#line 79 "..\..\Areas\Config\Views\Plugins\Install.cshtml" #line 79 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
@@ -488,9 +488,9 @@ WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-exclamation-triangle\""); WriteLiteral(" class=\"fa fa-exclamation-triangle\"");
WriteLiteral("></i><strong>Warning:</strong> All plugins run with the same level of network pri" + WriteLiteral("></i><strong>Warning:</strong> All plugins run with the same level of network pri" +
"vileges as the Disco Web App.<br />\r\n <strong>Only install plugin" + "vileges as the Disco ICT Web App.<br />\r\n <strong>Only install pl" +
"s from a trusted source.</strong>\r\n </p>\r\n </div>\r\n </div>\r" + "ugins from a trusted source.</strong>\r\n </p>\r\n </div>\r\n </d" +
"\n"); "iv>\r\n");
#line 96 "..\..\Areas\Config\Views\Plugins\Install.cshtml" #line 96 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
Disco.Web/Areas/Config/Views/SystemConfig/Index.cshtml
+5 -5
View File
@@ -19,7 +19,7 @@
<table> <table>
<tr> <tr>
<th style="width: 135px"> <th style="width: 135px">
Disco Version: Disco ICT Version:
</th> </th>
<td> <td>
<div> <div>
@@ -268,7 +268,7 @@
@Html.CheckBoxFor(m => m.ADSearchAllServers, new { disabled = "disabled" }) @Html.LabelFor(m => m.ADSearchAllServers) @Html.CheckBoxFor(m => m.ADSearchAllServers, new { disabled = "disabled" }) @Html.LabelFor(m => m.ADSearchAllServers)
<div class="info-box"> <div class="info-box">
<p class="fa-p"> <p class="fa-p">
<i class="fa fa-exclamation-circle warning"></i>Disco will not search the entire directory which consists of more than @(Disco.Services.Interop.ActiveDirectory.ActiveDirectory.MaxAllServerSearch) servers. Only servers within this site will be searched. <i class="fa fa-exclamation-circle warning"></i>Disco ICT will not search the entire directory which consists of more than @(Disco.Services.Interop.ActiveDirectory.ActiveDirectory.MaxAllServerSearch) servers. Only servers within this site will be searched.
</p> </p>
</div> </div>
} }
@@ -277,7 +277,7 @@
@Html.CheckBoxFor(m => m.ADSearchAllServers) @Html.LabelFor(m => m.ADSearchAllServers) @AjaxHelpers.AjaxLoader() @Html.CheckBoxFor(m => m.ADSearchAllServers) @Html.LabelFor(m => m.ADSearchAllServers) @AjaxHelpers.AjaxLoader()
<div class="info-box"> <div class="info-box">
<p class="fa-p"> <p class="fa-p">
<i class="fa fa-info-circle"></i>If this setting is enabled, Disco will query all servers within the directory rather than only servers within this site. <i class="fa fa-info-circle"></i>If this setting is enabled, Disco ICT will query all servers within the directory rather than only servers within this site.
</p> </p>
</div> </div>
<script> <script>
@@ -294,7 +294,7 @@
@Html.CheckBoxFor(m => m.ADSearchAllServers, new { disabled = "disabled" }) @Html.LabelFor(m => m.ADSearchAllServers) @Html.CheckBoxFor(m => m.ADSearchAllServers, new { disabled = "disabled" }) @Html.LabelFor(m => m.ADSearchAllServers)
<div class="info-box"> <div class="info-box">
<p class="fa-p"> <p class="fa-p">
<i class="fa fa-info-circle"></i>If this setting is enabled, Disco will query all servers within the directory rather than only servers within this site. <i class="fa fa-info-circle"></i>If this setting is enabled, Disco ICT will query all servers within the directory rather than only servers within this site.
</p> </p>
</div> </div>
</div> </div>
@@ -369,7 +369,7 @@
@Html.CheckBoxFor(m => m.ADSearchWildcardSuffixOnly, ADSearchWildcardSuffixOnlyAttributes) @Html.LabelFor(m => m.ADSearchWildcardSuffixOnly) @AjaxHelpers.AjaxLoader() @Html.CheckBoxFor(m => m.ADSearchWildcardSuffixOnly, ADSearchWildcardSuffixOnlyAttributes) @Html.LabelFor(m => m.ADSearchWildcardSuffixOnly) @AjaxHelpers.AjaxLoader()
<div class="info-box"> <div class="info-box">
<p class="fa-p"> <p class="fa-p">
<i class="fa fa-info-circle"></i>If this setting is enabled, Disco will utilize Active Directory indexes to greatly improve search performance. <i class="fa fa-info-circle"></i>If this setting is enabled, Disco ICT will utilize Active Directory indexes to greatly improve search performance.
If disabled, more results may be returned however performance will be reduced especially in large Active Directory domains. If disabled, more results may be returned however performance will be reduced especially in large Active Directory domains.
</p> </p>
</div> </div>
Disco.Web/Areas/Config/Views/SystemConfig/Index.generated.cs
+24 -24
View File
@@ -74,8 +74,8 @@ WriteLiteral(">\r\n <table>\r\n <tr>\r\n <th");
WriteLiteral(" style=\"width: 135px\""); WriteLiteral(" style=\"width: 135px\"");
WriteLiteral(">\r\n Disco Version:\r\n </th>\r\n <td>\r\n " + WriteLiteral(">\r\n Disco ICT Version:\r\n </th>\r\n <td>\r\n " +
" <div>\r\n <code>"); " <div>\r\n <code>");
#line 26 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 26 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
@@ -322,14 +322,14 @@ WriteLiteral(">");
#line hidden #line hidden
WriteLiteral("</div>\r\n <a"); WriteLiteral("</div>\r\n <a");
WriteAttribute("href", Tuple.Create(" href=\"", 4275), Tuple.Create("\"", 4319) WriteAttribute("href", Tuple.Create(" href=\"", 4279), Tuple.Create("\"", 4323)
#line 111 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 111 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
, Tuple.Create(Tuple.Create("", 4282), Tuple.Create<System.Object, System.Int32>(Model.UpdateLatestResponse.UrlLink , Tuple.Create(Tuple.Create("", 4286), Tuple.Create<System.Object, System.Int32>(Model.UpdateLatestResponse.UrlLink
#line default #line default
#line hidden #line hidden
, 4282), false) , 4286), false)
); );
WriteLiteral(" target=\"_blank\""); WriteLiteral(" target=\"_blank\"");
@@ -699,18 +699,18 @@ WriteLiteral(" <i");
WriteLiteral(" class=\"fa fa-exclamation warning fa-fw fa-lg\""); WriteLiteral(" class=\"fa fa-exclamation warning fa-fw fa-lg\"");
WriteAttribute("title", Tuple.Create(" title=\"", 8706), Tuple.Create("\"", 8789) WriteAttribute("title", Tuple.Create(" title=\"", 8710), Tuple.Create("\"", 8793)
, Tuple.Create(Tuple.Create("", 8714), Tuple.Create("Unavailable,", 8714), true) , Tuple.Create(Tuple.Create("", 8718), Tuple.Create("Unavailable,", 8718), true)
, Tuple.Create(Tuple.Create(" ", 8726), Tuple.Create("will", 8727), true) , Tuple.Create(Tuple.Create(" ", 8730), Tuple.Create("will", 8731), true)
, Tuple.Create(Tuple.Create(" ", 8731), Tuple.Create("retry", 8732), true) , Tuple.Create(Tuple.Create(" ", 8735), Tuple.Create("retry", 8736), true)
, Tuple.Create(Tuple.Create(" ", 8737), Tuple.Create("at", 8738), true) , Tuple.Create(Tuple.Create(" ", 8741), Tuple.Create("at", 8742), true)
#line 215 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 215 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
, Tuple.Create(Tuple.Create(" ", 8740), Tuple.Create<System.Object, System.Int32>(server.AvailableWhen.Value.ToLongTimeString() , Tuple.Create(Tuple.Create(" ", 8744), Tuple.Create<System.Object, System.Int32>(server.AvailableWhen.Value.ToLongTimeString()
#line default #line default
#line hidden #line hidden
, 8741), false) , 8745), false)
); );
WriteLiteral("></i>\r\n"); WriteLiteral("></i>\r\n");
@@ -967,11 +967,11 @@ WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-exclamation-circle warning\""); WriteLiteral(" class=\"fa fa-exclamation-circle warning\"");
WriteLiteral("></i>Disco will not search the entire directory which consists of more than "); WriteLiteral("></i>Disco ICT will not search the entire directory which consists of more than ");
#line 271 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 271 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
Write(Disco.Services.Interop.ActiveDirectory.ActiveDirectory.MaxAllServerSearch); Write(Disco.Services.Interop.ActiveDirectory.ActiveDirectory.MaxAllServerSearch);
#line default #line default
@@ -1040,9 +1040,9 @@ WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-info-circle\""); WriteLiteral(" class=\"fa fa-info-circle\"");
WriteLiteral("></i>If this setting is enabled, Disco will query all servers within the director" + WriteLiteral("></i>If this setting is enabled, Disco ICT will query all servers within the dire" +
"y rather than only servers within this site.\r\n " + "ctory rather than only servers within this site.\r\n " +
" </p>\r\n </div>\r\n"); " </p>\r\n </div>\r\n");
WriteLiteral(" <script>\r\n $(f" + WriteLiteral(" <script>\r\n $(f" +
"unction () {\r\n document.DiscoFunctions.Pr" + "unction () {\r\n document.DiscoFunctions.Pr" +
@@ -1108,9 +1108,9 @@ WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-info-circle\""); WriteLiteral(" class=\"fa fa-info-circle\"");
WriteLiteral("></i>If this setting is enabled, Disco will query all servers within the director" + WriteLiteral("></i>If this setting is enabled, Disco ICT will query all servers within the dire" +
"y rather than only servers within this site.\r\n </" + "ctory rather than only servers within this site.\r\n " +
"p>\r\n </div>\r\n </div>\r\n"); " </p>\r\n </div>\r\n </div>\r\n");
#line 301 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 301 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
@@ -1299,7 +1299,7 @@ WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-info-circle\""); WriteLiteral(" class=\"fa fa-info-circle\"");
WriteLiteral(@"></i>If this setting is enabled, Disco will utilize Active Directory indexes to greatly improve search performance. WriteLiteral(@"></i>If this setting is enabled, Disco ICT will utilize Active Directory indexes to greatly improve search performance.
If disabled, more results may be returned however performance will be reduced especially in large Active Directory domains. If disabled, more results may be returned however performance will be reduced especially in large Active Directory domains.
</p> </p>
</div> </div>
@@ -2180,14 +2180,14 @@ WriteLiteral(" name=\"Recipient\"");
WriteLiteral(" type=\"text\""); WriteLiteral(" type=\"text\"");
WriteAttribute("value", Tuple.Create(" value=\"", 34655), Tuple.Create("\"", 34688) WriteAttribute("value", Tuple.Create(" value=\"", 34675), Tuple.Create("\"", 34708)
#line 748 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml" #line 748 "..\..\Areas\Config\Views\SystemConfig\Index.cshtml"
, Tuple.Create(Tuple.Create("", 34663), Tuple.Create<System.Object, System.Int32>(CurrentUser.EmailAddress , Tuple.Create(Tuple.Create("", 34683), Tuple.Create<System.Object, System.Int32>(CurrentUser.EmailAddress
#line default #line default
#line hidden #line hidden
, 34663), false) , 34683), false)
); );
WriteLiteral(" />\r\n"); WriteLiteral(" />\r\n");
Disco.Web/Areas/Public/Views/Public/Credits.cshtml
+1 -1
View File
@@ -22,7 +22,7 @@
<div class="pageMenuArea MicrosoftNET"> <div class="pageMenuArea MicrosoftNET">
<a href="http://www.microsoft.com/net/" target="_blank">Microsoft .NET Framework</a> <a href="http://www.microsoft.com/net/" target="_blank">Microsoft .NET Framework</a>
<div class="pageMenuBlurb"> <div class="pageMenuBlurb">
The Microsoft .NET Framework is the hosting virtual machine most of Disco runs on. The Microsoft .NET Framework is the hosting virtual machine most of Disco ICT runs on.
Most of Disco's components are written in <a href="http://msdn.microsoft.com/en-us/vstudio/hh388566.aspx" Most of Disco's components are written in <a href="http://msdn.microsoft.com/en-us/vstudio/hh388566.aspx"
target="_blank">C#</a>. target="_blank">C#</a>.
</div> </div>
Disco.Web/Areas/Public/Views/Public/Credits.generated.cs
+3 -4
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34014 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -26,7 +26,6 @@ namespace Disco.Web.Areas.Public.Views.Public
using System.Web.Security; using System.Web.Security;
using System.Web.UI; using System.Web.UI;
using System.Web.WebPages; using System.Web.WebPages;
using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services; using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
@@ -94,8 +93,8 @@ WriteLiteral(">Microsoft .NET Framework</a>\r\n <div");
WriteLiteral(" class=\"pageMenuBlurb\""); WriteLiteral(" class=\"pageMenuBlurb\"");
WriteLiteral(">\r\n The Microsoft .NET Framework is the hosting virtual machin" + WriteLiteral(">\r\n The Microsoft .NET Framework is the hosting virtual machin" +
"e most of Disco runs on.\r\n Most of Disco\'s components are wri" + "e most of Disco ICT runs on.\r\n Most of Disco\'s components are" +
"tten in <a"); " written in <a");
WriteLiteral(" href=\"http://msdn.microsoft.com/en-us/vstudio/hh388566.aspx\""); WriteLiteral(" href=\"http://msdn.microsoft.com/en-us/vstudio/hh388566.aspx\"");
Disco.Web/Areas/Services/Controllers/ClientController.cs
+2 -2
View File
@@ -42,7 +42,7 @@ namespace Disco.Web.Areas.Services.Controllers
{ {
if (clientVersion < new Version(2, 2)) if (clientVersion < new Version(2, 2))
{ {
return new HttpStatusCodeResult(400, "Disco Client not compatible"); return new HttpStatusCodeResult(400, "Disco ICT Client not compatible");
} }
} }
} }
@@ -115,7 +115,7 @@ namespace Disco.Web.Areas.Services.Controllers
{ {
if (clientVersion < new Version(2, 2)) if (clientVersion < new Version(2, 2))
{ {
return new HttpStatusCodeResult(400, "Disco Client not compatible"); return new HttpStatusCodeResult(400, "Disco ICT Client not compatible");
} }
} }
} }
Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.js
+1 -1
View File
@@ -1070,7 +1070,7 @@ else {
self._uploadFilesInput.attr({ self._uploadFilesInput.attr({
type: 'file', type: 'file',
multiple: 'multiple', multiple: 'multiple',
title: 'Disco File Uploading' title: 'Disco ICT File Uploading'
}) })
.hide() .hide()
.change(function (e) { .change(function (e) {
Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/Disco-AttachmentUploader/disco-attachmentuploader.js
+1 -1
View File
@@ -20,7 +20,7 @@
self._uploadFilesInput.attr({ self._uploadFilesInput.attr({
type: 'file', type: 'file',
multiple: 'multiple', multiple: 'multiple',
title: 'Disco File Uploading' title: 'Disco ICT File Uploading'
}) })
.hide() .hide()
.change(function (e) { .change(function (e) {
Disco.Web/ClientSource/Style/ExpressionEditor.htm
+1 -1
View File
@@ -1,7 +1,7 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title>Disco - Expressions Editor</title> <title>Disco ICT - Expressions Editor</title>
<link href="ExpressionEditor.css" rel="stylesheet" type="text/css" /> <link href="ExpressionEditor.css" rel="stylesheet" type="text/css" />
</head> </head>
<body> <body>
Disco.Web/Controllers/JobController.cs
+2 -2
View File
@@ -689,7 +689,7 @@ namespace Disco.Web.Controllers
} }
model.JobDetailsSupported = false; model.JobDetailsSupported = false;
model.JobDetailsNotSupportedMessage = string.Format("Warranty Provider '{0}' is not integrated with Disco", job.JobMetaWarranty.ExternalName); model.JobDetailsNotSupportedMessage = string.Format("Warranty Provider '{0}' is not integrated with Disco ICT", job.JobMetaWarranty.ExternalName);
return View(model); return View(model);
} }
else else
@@ -871,7 +871,7 @@ namespace Disco.Web.Controllers
} }
model.JobDetailsSupported = false; model.JobDetailsSupported = false;
model.JobDetailsNotSupportedMessage = string.Format("Repair Provider '{0}' is not integrated with Disco", job.JobMetaNonWarranty.RepairerName); model.JobDetailsNotSupportedMessage = string.Format("Repair Provider '{0}' is not integrated with Disco ICT", job.JobMetaNonWarranty.RepairerName);
return View(model); return View(model);
} }
else else
Disco.Web/Models/InitialConfig/DatabaseModel.cs
+1 -1
View File
@@ -58,7 +58,7 @@ namespace Disco.Web.Models.InitialConfig
IntegratedSecurity = (this.AuthMethod.Equals("SSPI", StringComparison.OrdinalIgnoreCase)), IntegratedSecurity = (this.AuthMethod.Equals("SSPI", StringComparison.OrdinalIgnoreCase)),
UserID = (this.AuthMethod.Equals("SQL", StringComparison.OrdinalIgnoreCase)) ? this.Auth_SQL_Username : string.Empty, 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, Password = (this.AuthMethod.Equals("SQL", StringComparison.OrdinalIgnoreCase)) ? this.Auth_SQL_Password : string.Empty,
ApplicationName = "Disco WebApp", ApplicationName = "Disco ICT WebApp",
MultipleActiveResultSets = true, MultipleActiveResultSets = true,
Pooling = true Pooling = true
}; };
Disco.Web/Views/Device/Import.cshtml
+3 -3
View File
@@ -107,7 +107,7 @@
</table> </table>
<div id="Devices_Import_Documentation_DeviceModels_Dialog" class="dialog" title="Disco Device Model Ids"> <div id="Devices_Import_Documentation_DeviceModels_Dialog" class="dialog" title="Disco ICT Device Model Ids">
<table class="tableData"> <table class="tableData">
<thead> <thead>
<tr> <tr>
@@ -131,7 +131,7 @@
</table> </table>
</div> </div>
<div id="Devices_Import_Documentation_DeviceProfiles_Dialog" class="dialog" title="Disco Device Profile Ids"> <div id="Devices_Import_Documentation_DeviceProfiles_Dialog" class="dialog" title="Disco ICT Device Profile Ids">
<table class="tableData"> <table class="tableData">
<thead> <thead>
<tr> <tr>
@@ -155,7 +155,7 @@
</table> </table>
</div> </div>
<div id="Devices_Import_Documentation_DeviceBatches_Dialog" class="dialog" title="Disco Device Batch Ids"> <div id="Devices_Import_Documentation_DeviceBatches_Dialog" class="dialog" title="Disco ICT Device Batch Ids">
<table class="tableData"> <table class="tableData">
<thead> <thead>
<tr> <tr>
Disco.Web/Views/Device/Import.generated.cs
+3 -3
View File
@@ -374,7 +374,7 @@ WriteLiteral(" id=\"Devices_Import_Documentation_DeviceModels_Dialog\"");
WriteLiteral(" class=\"dialog\""); WriteLiteral(" class=\"dialog\"");
WriteLiteral(" title=\"Disco Device Model Ids\""); WriteLiteral(" title=\"Disco ICT Device Model Ids\"");
WriteLiteral(">\r\n <table"); WriteLiteral(">\r\n <table");
@@ -457,7 +457,7 @@ WriteLiteral(" id=\"Devices_Import_Documentation_DeviceProfiles_Dialog\"");
WriteLiteral(" class=\"dialog\""); WriteLiteral(" class=\"dialog\"");
WriteLiteral(" title=\"Disco Device Profile Ids\""); WriteLiteral(" title=\"Disco ICT Device Profile Ids\"");
WriteLiteral(">\r\n <table"); WriteLiteral(">\r\n <table");
@@ -540,7 +540,7 @@ WriteLiteral(" id=\"Devices_Import_Documentation_DeviceBatches_Dialog\"");
WriteLiteral(" class=\"dialog\""); WriteLiteral(" class=\"dialog\"");
WriteLiteral(" title=\"Disco Device Batch Ids\""); WriteLiteral(" title=\"Disco ICT Device Batch Ids\"");
WriteLiteral(">\r\n <table"); WriteLiteral(">\r\n <table");
Disco.Web/Views/InitialConfig/Administrators.cshtml
+3 -3
View File
@@ -2,11 +2,11 @@
@{ @{
ViewBag.Title = null; ViewBag.Title = null;
} }
<h1>@CommonHelpers.Breadcrumbs(Html.ToBreadcrumb("Initial Configuration", MVC.InitialConfig.Index(), "Disco Administrators"))</h1> <h1>@CommonHelpers.Breadcrumbs(Html.ToBreadcrumb("Initial Configuration", MVC.InitialConfig.Index(), "Disco ICT Administrators"))</h1>
<div id="initialConfig_Administrators"> <div id="initialConfig_Administrators">
<div class="form" style="width: 450px"> <div class="form" style="width: 450px">
<div> <div>
Disco Administrators have access to the entire Disco application. Disco ICT Administrators have access to the entire Disco ICT application.
<code>Domain Admins</code> is a required member and is always included regardless of configuration. <code>Domain Admins</code> is a required member and is always included regardless of configuration.
</div> </div>
<table> <table>
@@ -43,7 +43,7 @@
<i class="fa fa-lg fa-cog fa-spin"></i> <i class="fa fa-lg fa-cog fa-spin"></i>
Validating Configuration Validating Configuration
</h2> </h2>
<div>Please wait while the Disco configuration is validated</div> <div>Please wait while the Disco ICT configuration is validated</div>
</div> </div>
@using (Html.BeginForm()) @using (Html.BeginForm())
{ {
Disco.Web/Views/InitialConfig/Administrators.generated.cs
+7 -8
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.0 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Views.InitialConfig
using System.Web.UI; using System.Web.UI;
using System.Web.WebPages; using System.Web.WebPages;
using Disco; using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services; using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
@@ -56,7 +55,7 @@ WriteLiteral("\r\n<h1>");
#line 5 "..\..\Views\InitialConfig\Administrators.cshtml" #line 5 "..\..\Views\InitialConfig\Administrators.cshtml"
Write(CommonHelpers.Breadcrumbs(Html.ToBreadcrumb("Initial Configuration", MVC.InitialConfig.Index(), "Disco Administrators"))); Write(CommonHelpers.Breadcrumbs(Html.ToBreadcrumb("Initial Configuration", MVC.InitialConfig.Index(), "Disco ICT Administrators")));
#line default #line default
@@ -73,7 +72,7 @@ WriteLiteral(" style=\"width: 450px\"");
WriteLiteral(@"> WriteLiteral(@">
<div> <div>
Disco Administrators have access to the entire Disco application. Disco ICT Administrators have access to the entire Disco ICT application.
<code>Domain Admins</code> is a required member and is always included regardless of configuration. <code>Domain Admins</code> is a required member and is always included regardless of configuration.
</div> </div>
<table> <table>
@@ -114,14 +113,14 @@ WriteLiteral(">\r\n");
#line hidden #line hidden
WriteLiteral(" <li"); WriteLiteral(" <li");
WriteAttribute("class", Tuple.Create(" class=\"", 1161), Tuple.Create("\"", 1201) WriteAttribute("class", Tuple.Create(" class=\"", 1173), Tuple.Create("\"", 1213)
#line 21 "..\..\Views\InitialConfig\Administrators.cshtml" #line 21 "..\..\Views\InitialConfig\Administrators.cshtml"
, Tuple.Create(Tuple.Create("", 1169), Tuple.Create<System.Object, System.Int32>(sg.IsGroup ? "group" : "user" , Tuple.Create(Tuple.Create("", 1181), Tuple.Create<System.Object, System.Int32>(sg.IsGroup ? "group" : "user"
#line default #line default
#line hidden #line hidden
, 1169), false) , 1181), false)
); );
WriteLiteral(" data-subjectid=\""); WriteLiteral(" data-subjectid=\"");
@@ -246,7 +245,7 @@ WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\""); WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral("></i>\r\n Validating Configuration\r\n </h2>\r\n <div>Please wait while th" + WriteLiteral("></i>\r\n Validating Configuration\r\n </h2>\r\n <div>Please wait while th" +
"e Disco configuration is validated</div>\r\n</div>\r\n"); "e Disco ICT configuration is validated</div>\r\n</div>\r\n");
#line 48 "..\..\Views\InitialConfig\Administrators.cshtml" #line 48 "..\..\Views\InitialConfig\Administrators.cshtml"
Disco.Web/Views/InitialConfig/Complete.cshtml
+5 -5
View File
@@ -42,7 +42,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<h3><i class="fa @(Model.DiscoDnsTestResult.Item2 == null ? "fa-check-square success" : "fa-exclamation-circle error")"></i>&nbsp;Disco DNS Entry</h3> <h3><i class="fa @(Model.DiscoDnsTestResult.Item2 == null ? "fa-check-square success" : "fa-exclamation-circle error")"></i>&nbsp;Disco ICT DNS Entry</h3>
<div class="testResult"> <div class="testResult">
@{ @{
if (Model.DiscoDnsTestResult.Item1 != null) if (Model.DiscoDnsTestResult.Item1 != null)
@@ -114,7 +114,7 @@
} }
else else
{ {
<text>There was an error establishing a connection to <a href="https://discoict.com.au" target="_blank">https://discoict.com.au</a>. This may be caused by missing proxy settings - after starting Disco check these settings in the 'System' configuration area.</text> <text>There was an error establishing a connection to <a href="https://discoict.com.au" target="_blank">https://discoict.com.au</a>. This may be caused by missing proxy settings - after starting Disco ICT check these settings in the 'System' configuration area.</text>
<br /> <br />
<div class="exception"> <div class="exception">
@{var ex = Model.DiscoIctComAuWebResult; @{var ex = Model.DiscoIctComAuWebResult;
@@ -138,9 +138,9 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<h3><i class="fa fa-info-circle information"></i>&nbsp;Unblock ICMP (Ping) for the Disco server</h3> <h3><i class="fa fa-info-circle information"></i>&nbsp;Unblock ICMP (Ping) for the Disco ICT server</h3>
<div class="testResult"> <div class="testResult">
The Disco Client Bootstrapper requires the Disco server to respond to ICMP Echo requests (Ping) to function correctly. Please ensure any firewall rules are updated accordingly. The Disco ICT Client Bootstrapper requires the Disco server to respond to ICMP Echo requests (Ping) to function correctly. Please ensure any firewall rules are updated accordingly.
</div> </div>
</td> </td>
</tr> </tr>
@@ -158,7 +158,7 @@
@{ @{
if (Model.LaunchAllowed) if (Model.LaunchAllowed)
{ {
<a href="@(Url.Action(MVC.InitialConfig.RestartWebApp()))" class="button">Start Disco</a> <a href="@(Url.Action(MVC.InitialConfig.RestartWebApp()))" class="button">Start Disco ICT</a>
} }
else else
{ {
Disco.Web/Views/InitialConfig/Complete.generated.cs
+17 -18
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.0 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Views.InitialConfig
using System.Web.UI; using System.Web.UI;
using System.Web.WebPages; using System.Web.WebPages;
using Disco; using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services; using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
@@ -210,7 +209,7 @@ WriteAttribute("class", Tuple.Create(" class=\"", 2073), Tuple.Create("\"", 2185
, 2084), false) , 2084), false)
); );
WriteLiteral("></i>&nbsp;Disco DNS Entry</h3>\r\n <div"); WriteLiteral("></i>&nbsp;Disco ICT DNS Entry</h3>\r\n <div");
WriteLiteral(" class=\"testResult\""); WriteLiteral(" class=\"testResult\"");
@@ -444,15 +443,15 @@ WriteLiteral("\r\n </div>\r\n");
WriteLiteral("\r\n </div>\r\n </td>\r\n </tr>\r\n " + WriteLiteral("\r\n </div>\r\n </td>\r\n </tr>\r\n " +
" <tr>\r\n <td>\r\n <h3><i"); " <tr>\r\n <td>\r\n <h3><i");
WriteAttribute("class", Tuple.Create(" class=\"", 5012), Tuple.Create("\"", 5122) WriteAttribute("class", Tuple.Create(" class=\"", 5016), Tuple.Create("\"", 5126)
, Tuple.Create(Tuple.Create("", 5020), Tuple.Create("fa", 5020), true) , Tuple.Create(Tuple.Create("", 5024), Tuple.Create("fa", 5024), true)
#line 108 "..\..\Views\InitialConfig\Complete.cshtml" #line 108 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create(" ", 5022), Tuple.Create<System.Object, System.Int32>(Model.DiscoIctComAuWebResult == null ? "fa-check-square success" : "fa-exclamation-circle error" , Tuple.Create(Tuple.Create(" ", 5026), Tuple.Create<System.Object, System.Int32>(Model.DiscoIctComAuWebResult == null ? "fa-check-square success" : "fa-exclamation-circle error"
#line default #line default
#line hidden #line hidden
, 5023), false) , 5027), false)
); );
WriteLiteral("></i>&nbsp;Connectivity to <a"); WriteLiteral("></i>&nbsp;Connectivity to <a");
@@ -512,7 +511,7 @@ WriteLiteral(" href=\"https://discoict.com.au\"");
WriteLiteral(" target=\"_blank\""); WriteLiteral(" target=\"_blank\"");
WriteLiteral(">https://discoict.com.au</a>. This may be caused by missing proxy settings - afte" + WriteLiteral(">https://discoict.com.au</a>. This may be caused by missing proxy settings - afte" +
"r starting Disco check these settings in the \'System\' configuration area."); "r starting Disco ICT check these settings in the \'System\' configuration area.");
WriteLiteral("\r\n"); WriteLiteral("\r\n");
@@ -590,13 +589,13 @@ WriteLiteral("\r\n </div>\r\n </td>\r\n
WriteLiteral(" class=\"fa fa-info-circle information\""); WriteLiteral(" class=\"fa fa-info-circle information\"");
WriteLiteral("></i>&nbsp;Unblock ICMP (Ping) for the Disco server</h3>\r\n <di" + WriteLiteral("></i>&nbsp;Unblock ICMP (Ping) for the Disco ICT server</h3>\r\n " +
"v"); " <div");
WriteLiteral(" class=\"testResult\""); WriteLiteral(" class=\"testResult\"");
WriteLiteral(@"> WriteLiteral(@">
The Disco Client Bootstrapper requires the Disco server to respond to ICMP Echo requests (Ping) to function correctly. Please ensure any firewall rules are updated accordingly. The Disco ICT Client Bootstrapper requires the Disco server to respond to ICMP Echo requests (Ping) to function correctly. Please ensure any firewall rules are updated accordingly.
</div> </div>
</td> </td>
</tr> </tr>
@@ -635,19 +634,19 @@ WriteLiteral(">\r\n");
#line hidden #line hidden
WriteLiteral(" <a"); WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 7927), Tuple.Create("\"", 7982) WriteAttribute("href", Tuple.Create(" href=\"", 7943), Tuple.Create("\"", 7998)
#line 161 "..\..\Views\InitialConfig\Complete.cshtml" #line 161 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create("", 7934), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.RestartWebApp()) , Tuple.Create(Tuple.Create("", 7950), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.RestartWebApp())
#line default #line default
#line hidden #line hidden
, 7934), false) , 7950), false)
); );
WriteLiteral(" class=\"button\""); WriteLiteral(" class=\"button\"");
WriteLiteral(">Start Disco</a>\r\n"); WriteLiteral(">Start Disco ICT</a>\r\n");
#line 162 "..\..\Views\InitialConfig\Complete.cshtml" #line 162 "..\..\Views\InitialConfig\Complete.cshtml"
@@ -662,14 +661,14 @@ WriteLiteral(" <a");
WriteLiteral(" id=\"tryAgain\""); WriteLiteral(" id=\"tryAgain\"");
WriteAttribute("href", Tuple.Create(" href=\"", 8092), Tuple.Create("\"", 8142) WriteAttribute("href", Tuple.Create(" href=\"", 8112), Tuple.Create("\"", 8162)
#line 165 "..\..\Views\InitialConfig\Complete.cshtml" #line 165 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create("", 8099), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.Complete()) , Tuple.Create(Tuple.Create("", 8119), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.Complete())
#line default #line default
#line hidden #line hidden
, 8099), false) , 8119), false)
); );
WriteLiteral(" class=\"button\""); WriteLiteral(" class=\"button\"");
Disco.Web/Views/InitialConfig/Database.cshtml
+1 -1
View File
@@ -72,7 +72,7 @@
<i class="fa fa-lg fa-cog fa-spin"></i> <i class="fa fa-lg fa-cog fa-spin"></i>
Building and Validating Database Building and Validating Database
</h2> </h2>
<div>Please wait while the Disco database is created and/or validated</div> <div>Please wait while the Disco ICT database is created and/or validated</div>
</div> </div>
<script> <script>
(function () { (function () {
Disco.Web/Views/InitialConfig/Database.generated.cs
+23 -24
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.0 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Views.InitialConfig
using System.Web.UI; using System.Web.UI;
using System.Web.WebPages; using System.Web.WebPages;
using Disco; using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services; using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
@@ -293,28 +292,28 @@ WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\""); WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral("></i>\r\n Building and Validating Database\r\n </h2>\r\n <div>Please wait " + WriteLiteral("></i>\r\n Building and Validating Database\r\n </h2>\r\n <div>Please wait " +
"while the Disco database is created and/or validated</div>\r\n</div>\r\n<script>\r\n " + "while the Disco ICT database is created and/or validated</div>\r\n</div>\r\n<script>" +
" (function () {\r\n\r\n $(function () {\r\n var initialized = false" + "\r\n (function () {\r\n\r\n $(function () {\r\n var initialized = f" +
";\r\n\r\n $(\'#AuthMethod\').change(function () {\r\n $this = " + "alse;\r\n\r\n $(\'#AuthMethod\').change(function () {\r\n $thi" +
"$(this);\r\n if ($this.val() === \'SQL\') {\r\n // E" + "s = $(this);\r\n if ($this.val() === \'SQL\') {\r\n " +
"nable Validation\r\n $(\'#Auth_SQL_Username\').attr(\'data-val\', t" + "// Enable Validation\r\n $(\'#Auth_SQL_Username\').attr(\'data-val" +
"rue).attr(\'data-val-required\', \'The Username is required\');\r\n " + "\', true).attr(\'data-val-required\', \'The Username is required\');\r\n " +
" $(\'#Auth_SQL_Password\').attr(\'data-val\', true).attr(\'data-val-required\', \'The P" + " $(\'#Auth_SQL_Password\').attr(\'data-val\', true).attr(\'data-val-required\', \'T" +
"assword is required\');\r\n\r\n $(\'#auth_Sql\').slideDown();\r\n " + "he Password is required\');\r\n\r\n $(\'#auth_Sql\').slideDown();\r\n " +
" } else {\r\n $(\'#Auth_SQL_Username\').attr(\'data-val\'" + " } else {\r\n $(\'#Auth_SQL_Username\').attr(\'data-" +
", false);\r\n $(\'#Auth_SQL_Password\').attr(\'data-val\', false);\r" + "val\', false);\r\n $(\'#Auth_SQL_Password\').attr(\'data-val\', fals" +
"\n\r\n $(\'#auth_Sql\').slideUp();\r\n }\r\n\r\n " + "e);\r\n\r\n $(\'#auth_Sql\').slideUp();\r\n }\r\n\r\n " +
" // Rebuild Validation\r\n if (initialized) {\r\n " + " // Rebuild Validation\r\n if (initialized) {\r\n " +
" $.validator.unobtrusive.reparse(\'#auth_Sql\');\r\n }\r\n " + " $.validator.unobtrusive.reparse(\'#auth_Sql\');\r\n }\r\n " +
" }).change();\r\n\r\n $(\'#dialogWait\').dialog({\r\n autoO" + " }).change();\r\n\r\n $(\'#dialogWait\').dialog({\r\n a" +
"pen: false,\r\n draggable: false,\r\n modal: true,\r\n " + "utoOpen: false,\r\n draggable: false,\r\n modal: true," +
" resizable: false,\r\n width: 400,\r\n he" + "\r\n resizable: false,\r\n width: 400,\r\n " +
"ight: 150,\r\n closeOnEscape: false\r\n }).closest(\'.ui-di" + " height: 150,\r\n closeOnEscape: false\r\n }).closest(\'.u" +
"alog\').find(\'.ui-dialog-titlebar-close\').hide();\r\n\r\n $(\'#submitForm\')" + "i-dialog\').find(\'.ui-dialog-titlebar-close\').hide();\r\n\r\n $(\'#submitFo" +
".closest(\'form\').submit(function () {\r\n if ($(this).valid()) {\r\n " + "rm\').closest(\'form\').submit(function () {\r\n if ($(this).valid()) " +
" $(\'#dialogWait\').dialog(\'open\');\r\n }\r\n " + "{\r\n $(\'#dialogWait\').dialog(\'open\');\r\n }\r\n " +
" return true;\r\n });\r\n\r\n initialized = true;\r\n " + " return true;\r\n });\r\n\r\n initialized = true;\r\n " +
" });\r\n\r\n })();\r\n</script>\r\n"); " });\r\n\r\n })();\r\n</script>\r\n");
} }
} }
Disco.Web/Views/InitialConfig/FileStore.cshtml
+1 -1
View File
@@ -42,7 +42,7 @@
<i class="fa fa-lg fa-cog fa-spin"></i> <i class="fa fa-lg fa-cog fa-spin"></i>
Building and Validating File Store Building and Validating File Store
</h2> </h2>
<div>Please wait while the Disco File Store is created and/or validated</div> <div>Please wait while the Disco ICT File Store is created and/or validated</div>
</div> </div>
<div id="dialogCreateDirectory" title="Create Directory" class="dialog"> <div id="dialogCreateDirectory" title="Create Directory" class="dialog">
<h2>Create Directory</h2> <h2>Create Directory</h2>
Disco.Web/Views/InitialConfig/FileStore.generated.cs
+3 -3
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.0 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Views.InitialConfig
using System.Web.UI; using System.Web.UI;
using System.Web.WebPages; using System.Web.WebPages;
using Disco; using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services; using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
@@ -186,7 +185,8 @@ WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\""); WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral("></i>\r\n Building and Validating File Store\r\n </h2>\r\n <div>Please wai" + WriteLiteral("></i>\r\n Building and Validating File Store\r\n </h2>\r\n <div>Please wai" +
"t while the Disco File Store is created and/or validated</div>\r\n</div>\r\n<div"); "t while the Disco ICT File Store is created and/or validated</div>\r\n</div>\r\n<div" +
"");
WriteLiteral(" id=\"dialogCreateDirectory\""); WriteLiteral(" id=\"dialogCreateDirectory\"");
Disco.Web/Views/InitialConfig/RestartWebApp.cshtml
+3 -3
View File
@@ -1,13 +1,13 @@
@{ @{
ViewBag.Title = null; ViewBag.Title = null;
} }
<h1>@CommonHelpers.Breadcrumbs("Initial Configuration > Starting Disco")</h1> <h1>@CommonHelpers.Breadcrumbs("Initial Configuration > Starting Disco ICT")</h1>
<div id="dialog" title="Please Wait" style="padding-top: 30px;"> <div id="dialog" title="Please Wait" style="padding-top: 30px;">
<h2> <h2>
<i class="fa fa-lg fa-cog fa-spin"></i> <i class="fa fa-lg fa-cog fa-spin"></i>
Starting Disco Starting Disco ICT
</h2> </h2>
<div style="padding-left: 31px;">Please wait while the Disco environment is initialized</div> <div style="padding-left: 31px;">Please wait while the Disco ICT environment is initialized</div>
</div> </div>
<script> <script>
(function () { (function () {
Disco.Web/Views/InitialConfig/RestartWebApp.generated.cs
+4 -5
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.0 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Views.InitialConfig
using System.Web.UI; using System.Web.UI;
using System.Web.WebPages; using System.Web.WebPages;
using Disco; using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services; using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
@@ -56,7 +55,7 @@ WriteLiteral("\r\n<h1>");
#line 4 "..\..\Views\InitialConfig\RestartWebApp.cshtml" #line 4 "..\..\Views\InitialConfig\RestartWebApp.cshtml"
Write(CommonHelpers.Breadcrumbs("Initial Configuration > Starting Disco")); Write(CommonHelpers.Breadcrumbs("Initial Configuration > Starting Disco ICT"));
#line default #line default
@@ -73,11 +72,11 @@ WriteLiteral(">\r\n <h2>\r\n <i");
WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\""); WriteLiteral(" class=\"fa fa-lg fa-cog fa-spin\"");
WriteLiteral("></i>\r\n Starting Disco\r\n </h2>\r\n <div"); WriteLiteral("></i>\r\n Starting Disco ICT\r\n </h2>\r\n <div");
WriteLiteral(" style=\"padding-left: 31px;\""); WriteLiteral(" style=\"padding-left: 31px;\"");
WriteLiteral(@">Please wait while the Disco environment is initialized</div> WriteLiteral(@">Please wait while the Disco ICT environment is initialized</div>
</div> </div>
<script> <script>
(function () { (function () {
Disco.Web/Views/InitialConfig/Welcome.cshtml
+1 -1
View File
@@ -4,7 +4,7 @@
} }
<h1>Welcome to Disco ICT Management!</h1> <h1>Welcome to Disco ICT Management!</h1>
<div id="initialConfig_Welcome"> <div id="initialConfig_Welcome">
<p>The installation is complete, but a few things need to be configured before Disco can be started.</p> <p>The installation is complete, but a few things need to be configured before Disco ICT can be started.</p>
@using (Html.BeginForm()) @using (Html.BeginForm())
{ {
<div class="form" style="width: 400px"> <div class="form" style="width: 400px">
Disco.Web/Views/InitialConfig/Welcome.generated.cs
+2 -3
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34014 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Views.InitialConfig
using System.Web.UI; using System.Web.UI;
using System.Web.WebPages; using System.Web.WebPages;
using Disco; using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services; using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
@@ -57,7 +56,7 @@ WriteLiteral("\r\n<h1>Welcome to Disco ICT Management!</h1>\r\n<div");
WriteLiteral(" id=\"initialConfig_Welcome\""); WriteLiteral(" id=\"initialConfig_Welcome\"");
WriteLiteral(">\r\n <p>The installation is complete, but a few things need to be configured be" + WriteLiteral(">\r\n <p>The installation is complete, but a few things need to be configured be" +
"fore Disco can be started.</p>\r\n"); "fore Disco ICT can be started.</p>\r\n");
#line 8 "..\..\Views\InitialConfig\Welcome.cshtml" #line 8 "..\..\Views\InitialConfig\Welcome.cshtml"
Disco.Web/Views/Update/Index.cshtml
+1 -1
View File
@@ -4,5 +4,5 @@
Html.BundleDeferred("~/Style/Config"); Html.BundleDeferred("~/Style/Config");
} }
<h1>Disco Post-Update Configuration</h1> <h1>Disco ICT Post-Update Configuration</h1>
@Html.PartialCompiled(typeof(Disco.Web.Areas.Config.Views.Shared.TaskStatus), Model.SessionId) @Html.PartialCompiled(typeof(Disco.Web.Areas.Config.Views.Shared.TaskStatus), Model.SessionId)
Disco.Web/Views/Update/Index.generated.cs
+2 -3
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.34014 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -27,7 +27,6 @@ namespace Disco.Web.Views.Update
using System.Web.UI; using System.Web.UI;
using System.Web.WebPages; using System.Web.WebPages;
using Disco; using Disco;
using Disco.BI.Extensions;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Services; using Disco.Services;
using Disco.Services.Authorization; using Disco.Services.Authorization;
@@ -54,7 +53,7 @@ namespace Disco.Web.Views.Update
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n<h1>Disco Post-Update Configuration</h1>\r\n"); WriteLiteral("\r\n<h1>Disco ICT Post-Update Configuration</h1>\r\n");
#line 8 "..\..\Views\Update\Index.cshtml" #line 8 "..\..\Views\Update\Index.cshtml"