qol: formatting
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
using System;
|
||||
using Disco.Client.Extensions;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
using System.Reflection;
|
||||
using Disco.Client.Extensions;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace Disco.Client
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using System.Text;
|
||||
using Disco.Models.ClientServices;
|
||||
using Disco.Models.ClientServices;
|
||||
using System.Text;
|
||||
|
||||
namespace Disco.Client.Extensions
|
||||
{
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using Disco.Client.Extensions;
|
||||
using Disco.Client.Interop;
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using Disco.Client.Extensions;
|
||||
using Disco.Client.Interop;
|
||||
|
||||
namespace Disco.Client
|
||||
{
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using System;
|
||||
using Disco.Client.Extensions;
|
||||
using Disco.Models.ClientServices;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using Disco.Models.ClientServices;
|
||||
using Disco.Client.Extensions;
|
||||
|
||||
namespace Disco.Client
|
||||
{
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Net;
|
||||
using System.IO;
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace Disco.ClientBootstrapper
|
||||
{
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.IO;
|
||||
|
||||
namespace Disco.ClientBootstrapper.Interop
|
||||
{
|
||||
|
||||
@@ -40,14 +40,16 @@ namespace Disco.ClientBootstrapper.Interop
|
||||
{
|
||||
var wirelessConnectionStatus = WirelessConnectionStatus;
|
||||
}
|
||||
catch (Exception) {
|
||||
catch (Exception)
|
||||
{
|
||||
IsWireless = false;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public int WirelessConnectionStatus
|
||||
{
|
||||
get {
|
||||
get
|
||||
{
|
||||
if (IsWireless)
|
||||
{
|
||||
IntPtr handle = IntPtr.Zero;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net.NetworkInformation;
|
||||
using System.Management;
|
||||
using System.Net.NetworkInformation;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Xml;
|
||||
|
||||
|
||||
@@ -649,7 +649,8 @@ namespace Disco.ClientBootstrapper.Interop.WIMInterop
|
||||
///Private null constructor
|
||||
///</summary>
|
||||
private
|
||||
NativeMethods() { }
|
||||
NativeMethods()
|
||||
{ }
|
||||
|
||||
[DllImport("Wimgapi.dll", ExactSpelling = true,
|
||||
EntryPoint = "WIMCreateFile",
|
||||
|
||||
@@ -118,8 +118,7 @@ namespace Disco.ClientBootstrapper
|
||||
SleepThread(4000, true);
|
||||
Interop.ShutdownInterop.Shutdown();
|
||||
}
|
||||
else
|
||||
if (PostBootstrapperActions.Contains("Reboot"))
|
||||
else if (PostBootstrapperActions.Contains("Reboot"))
|
||||
{
|
||||
Status.UpdateStatus("System Preparation (Bootstrapper)", "Rebooting; Finished...", string.Empty, false, 0);
|
||||
SleepThread(4000, true);
|
||||
|
||||
@@ -35,7 +35,8 @@ namespace Disco.Data.Configuration.Modules
|
||||
|
||||
public bool? SearchAllServers
|
||||
{
|
||||
get {
|
||||
get
|
||||
{
|
||||
var value = Get<bool?>(null);
|
||||
|
||||
/// migrate <see cref="SearchAllForestServers"/>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Data.Entity.Infrastructure;
|
||||
using Microsoft.Win32;
|
||||
using Microsoft.Win32;
|
||||
using System;
|
||||
using System.Data.Common;
|
||||
using System.Data.Entity.Infrastructure;
|
||||
using System.Security;
|
||||
|
||||
namespace Disco.Data.Repository
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
using System;
|
||||
using Disco.Models.Repository;
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Data.Entity.Infrastructure;
|
||||
using System.Data.Objects;
|
||||
using System.Linq;
|
||||
using System.Reactive.Subjects;
|
||||
using System.Data.Entity.Infrastructure;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Data.Objects;
|
||||
using Disco.Models.Repository;
|
||||
|
||||
namespace Disco.Data.Repository.Monitor
|
||||
{
|
||||
|
||||
@@ -52,7 +52,8 @@ namespace Disco.Data.Repository.Monitor
|
||||
return (T)dbEntityState.CurrentValues[PropertyName];
|
||||
}
|
||||
|
||||
public void ExecuteAfterCommit(Action<RepositoryMonitorEvent> action){
|
||||
public void ExecuteAfterCommit(Action<RepositoryMonitorEvent> action)
|
||||
{
|
||||
if (afterCommit)
|
||||
{
|
||||
// Execute Immediately
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using System.Linq;
|
||||
|
||||
namespace Disco.Models.Repository
|
||||
{
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using System.Linq;
|
||||
|
||||
namespace Disco.Models.Repository
|
||||
{
|
||||
|
||||
@@ -1,14 +1,18 @@
|
||||
using RazorGenerator.Mvc;
|
||||
using System.Web;
|
||||
using System.Web.Mvc;
|
||||
using System.Web.WebPages;
|
||||
using RazorGenerator.Mvc;
|
||||
|
||||
[assembly: WebActivatorEx.PostApplicationStartMethod(typeof(Disco.Services.App_Start.RazorGeneratorMvcStart), "Start")]
|
||||
|
||||
namespace Disco.Services.App_Start {
|
||||
public static class RazorGeneratorMvcStart {
|
||||
public static void Start() {
|
||||
var engine = new PrecompiledMvcEngine(typeof(RazorGeneratorMvcStart).Assembly) {
|
||||
namespace Disco.Services.App_Start
|
||||
{
|
||||
public static class RazorGeneratorMvcStart
|
||||
{
|
||||
public static void Start()
|
||||
{
|
||||
var engine = new PrecompiledMvcEngine(typeof(RazorGeneratorMvcStart).Assembly)
|
||||
{
|
||||
UsePhysicalViewsIfNewer = HttpContext.Current.Request.IsLocal
|
||||
};
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Disco.Models.Services.Authorization;
|
||||
using Disco.Models.Repository;
|
||||
using Disco.Models.Repository;
|
||||
using Disco.Models.Services.Authorization;
|
||||
using Disco.Services.Authorization.Roles;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -30,8 +30,7 @@ namespace Disco.Services.Authorization
|
||||
|
||||
if (UserService.CurrentAuthorization == null)
|
||||
resultMessage = AuthorizationToken.RequireAuthenticationMessage;
|
||||
else
|
||||
if (string.IsNullOrEmpty(authorizedClaim))
|
||||
else if (string.IsNullOrEmpty(authorizedClaim))
|
||||
resultMessage = AuthorizationToken.RequireDiscoAuthorizationMessage;
|
||||
else
|
||||
resultMessage = AuthorizationToken.BuildRequireMessage(authorizedClaim);
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Models.Services.Authorization;
|
||||
using Disco.Models.Repository;
|
||||
using Disco.Models.Services.Authorization;
|
||||
using Disco.Services.Interop.ActiveDirectory;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Disco.Services.Interop.ActiveDirectory;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace Disco.Services.Authorization.Roles
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Disco.Models.Services.Authorization;
|
||||
using Disco.Models.Repository;
|
||||
using Disco.Models.Repository;
|
||||
using Disco.Models.Services.Authorization;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
@@ -20,8 +20,7 @@ namespace Disco.Services.Expressions
|
||||
{
|
||||
if (expressionParseException == null)
|
||||
return null;
|
||||
else
|
||||
if (evaluateParseException == null)
|
||||
else if (evaluateParseException == null)
|
||||
evaluateParseException = EvaluateExpressionParseException.FromRecognitionException(expressionParseException, Source);
|
||||
return evaluateParseException;
|
||||
}
|
||||
|
||||
+2
-1
@@ -53,7 +53,8 @@ namespace Disco.Services.Expressions.Extensions.ImageResultImplementations
|
||||
{
|
||||
maxWidth = images.Sum(i => i.Width);
|
||||
maxHeight = images.Max(i => i.Height);
|
||||
}else if (MontageVerticalLayout)
|
||||
}
|
||||
else if (MontageVerticalLayout)
|
||||
{
|
||||
maxWidth = images.Max(i => i.Width);
|
||||
maxHeight = images.Sum(i => i.Height);
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using Disco.Data.Repository;
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Reactive.Subjects;
|
||||
using Disco.Data.Repository;
|
||||
|
||||
namespace Disco.Services.Interop.ActiveDirectory
|
||||
{
|
||||
|
||||
@@ -15,9 +15,9 @@ using System.Text;
|
||||
namespace Disco.Services.Interop.DiscoServices
|
||||
{
|
||||
using StatisticInt = UpdateRequestV2.StatisticInt;
|
||||
using StatisticIntPair = UpdateRequestV2.StatisticIntPair;
|
||||
using StatisticJob = UpdateRequestV2.StatisticJob;
|
||||
using StatisticString = UpdateRequestV2.StatisticString;
|
||||
using StatisticIntPair = UpdateRequestV2.StatisticIntPair;
|
||||
|
||||
public static class UpdateQuery
|
||||
{
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using Disco.Data.Repository.Monitor;
|
||||
using Disco.Models.Repository;
|
||||
using Disco.Services.Authorization;
|
||||
using Disco.Services.Users;
|
||||
using Disco.Services.Web.Signalling;
|
||||
using Microsoft.AspNet.SignalR;
|
||||
using Microsoft.AspNet.SignalR.Hubs;
|
||||
@@ -9,7 +10,6 @@ using System;
|
||||
using System.Linq;
|
||||
using System.Reactive.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Disco.Services.Users;
|
||||
|
||||
namespace Disco.Services.Jobs
|
||||
{
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Disco.Data.Repository;
|
||||
using System.IO;
|
||||
using System.Data.SqlServerCe;
|
||||
using Disco.Data.Repository;
|
||||
using Newtonsoft.Json;
|
||||
using Quartz;
|
||||
using Quartz.Impl;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data.SqlServerCe;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
||||
namespace Disco.Services.Logging
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Quartz;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Data.Repository;
|
||||
using Quartz;
|
||||
|
||||
namespace Disco.Services.Logging
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using System.Linq;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using System.Linq;
|
||||
|
||||
namespace Disco.Services.Logging.Models
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using System;
|
||||
using Disco.Models.Exporting;
|
||||
using Disco.Models.Exporting;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
|
||||
namespace Disco.Services.Logging.Models
|
||||
{
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Web.Mvc;
|
||||
|
||||
namespace Disco.Services.Logging
|
||||
|
||||
@@ -90,7 +90,8 @@ namespace Disco.Services.Plugins.Features.DetailsProvider
|
||||
return user.UserDetails
|
||||
.Where(d => string.Equals(d.Scope, DetailsScope, StringComparison.Ordinal))
|
||||
.ToDictionary(d => d.Key, d => d.Value, StringComparer.OrdinalIgnoreCase);
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
return database.UserDetails
|
||||
.Where(d => d.UserId == user.UserId &&
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Web.Mvc;
|
||||
using Disco.Models.UI;
|
||||
using Disco.Models.UI;
|
||||
using Disco.Services.Plugins.Features.UIExtension.Results;
|
||||
using System;
|
||||
using System.Web.Mvc;
|
||||
|
||||
namespace Disco.Services.Plugins.Features.UIExtension
|
||||
{
|
||||
@@ -19,7 +19,8 @@ namespace Disco.Services.Plugins.Features.UIExtension
|
||||
}
|
||||
public UIExtensionFeature()
|
||||
{
|
||||
plugin = new Lazy<WebHelper>(new Func<WebHelper>(() => {
|
||||
plugin = new Lazy<WebHelper>(new Func<WebHelper>(() =>
|
||||
{
|
||||
if (Context == null)
|
||||
throw new InvalidOperationException("The Context property is not initialized");
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using Disco.Models.UI;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Web;
|
||||
using System.Web.Mvc;
|
||||
using Disco.Models.UI;
|
||||
|
||||
namespace Disco.Services.Plugins.Features.UIExtension
|
||||
{
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
using System;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Models.BI.Config;
|
||||
using Disco.Models.Repository;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.Mvc;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Models.BI.Config;
|
||||
using Disco.Models.Repository;
|
||||
|
||||
namespace Disco.Services.Plugins.Features.WarrantyProvider
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using System;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Services.Tasks;
|
||||
using System;
|
||||
|
||||
namespace Disco.Services.Plugins
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using System;
|
||||
using Disco.Data.Repository;
|
||||
using System;
|
||||
using System.Web.Mvc;
|
||||
using Disco.Data.Repository;
|
||||
|
||||
namespace Disco.Services.Plugins
|
||||
{
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
using System;
|
||||
using Disco.Services.Web.Bundles;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Web.Mvc;
|
||||
using System.Web.WebPages;
|
||||
using System.Web.Routing;
|
||||
using System.Web;
|
||||
using System.Web.Mvc.Html;
|
||||
using System.Globalization;
|
||||
using Disco.Services.Web.Bundles;
|
||||
using System.IO;
|
||||
using System.Web;
|
||||
using System.Web.Mvc;
|
||||
using System.Web.Mvc.Html;
|
||||
using System.Web.Routing;
|
||||
using System.Web.WebPages;
|
||||
|
||||
namespace Disco.Services.Plugins
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using System;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Data.Repository;
|
||||
using System;
|
||||
|
||||
namespace Disco.Services.Plugins
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Data.Repository;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Linq;
|
||||
|
||||
namespace Disco.Services.Plugins
|
||||
{
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
using System;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Services.Authorization;
|
||||
using Disco.Services.Tasks;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
@@ -6,11 +11,6 @@ using System.Reflection;
|
||||
using System.Security.Cryptography;
|
||||
using System.Web;
|
||||
using System.Web.Mvc;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Services.Tasks;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using Disco.Services.Authorization;
|
||||
using System.Web.Routing;
|
||||
|
||||
namespace Disco.Services.Plugins
|
||||
|
||||
@@ -20,7 +20,8 @@ namespace Disco.Services.Plugins
|
||||
var self = GetType();
|
||||
Manifest = Plugins.GetPlugin(self.Assembly);
|
||||
|
||||
_plugin = new Lazy<WebPageHelper<T>>(() => {
|
||||
_plugin = new Lazy<WebPageHelper<T>>(() =>
|
||||
{
|
||||
if (Context == null)
|
||||
throw new InvalidOperationException("The WebViewPage Context property is not initialized");
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Disco.Services.Logging;
|
||||
using Disco.Services.Logging;
|
||||
using Disco.Services.Logging.Models;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
|
||||
namespace Disco.Services.Plugins
|
||||
|
||||
@@ -139,7 +139,8 @@ namespace Disco.Services.Plugins
|
||||
pluginPackagesLocation = database.DiscoConfiguration.PluginPackagesLocation;
|
||||
installedPluginManifests = OfflineInstalledPlugins(database);
|
||||
|
||||
if (installedPluginManifests.Count > 0){
|
||||
if (installedPluginManifests.Count > 0)
|
||||
{
|
||||
libraryManifest = PluginLibrary.LoadManifest(database);
|
||||
libraryIncompatibility = libraryManifest.LoadIncompatibilityData();
|
||||
}
|
||||
|
||||
@@ -3,8 +3,8 @@ using Microsoft.AspNet.SignalR;
|
||||
using Microsoft.AspNet.SignalR.Hubs;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Reactive.Linq;
|
||||
using System.Linq;
|
||||
using System.Reactive.Linq;
|
||||
|
||||
namespace Disco.Services.Tasks
|
||||
{
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Disco.Data.Repository;
|
||||
using Quartz;
|
||||
using Quartz.Impl;
|
||||
using Disco.Data.Repository;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
|
||||
namespace Disco.Services.Tasks
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
using System;
|
||||
using Disco.Services.Logging;
|
||||
using Disco.Services.Logging.Models;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.Entity.Validation;
|
||||
using System.Text;
|
||||
using Disco.Services.Logging;
|
||||
using Disco.Services.Logging.Models;
|
||||
|
||||
namespace Disco.Services.Tasks
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Disco.Services.Authorization;
|
||||
using Disco.Models.Repository;
|
||||
using Disco.Models.Repository;
|
||||
using Disco.Services.Authorization;
|
||||
using Disco.Services.Users;
|
||||
|
||||
namespace Disco.Services.Web
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
using System;
|
||||
using Disco.Services.Plugins;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.Mvc;
|
||||
using Disco.Services.Plugins;
|
||||
|
||||
namespace Disco.Web.Extensions
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
using Disco.Models.Repository;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.Mvc;
|
||||
using Disco.Models.Repository;
|
||||
|
||||
namespace Disco.Web.Extensions
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
using Disco.Models.Repository;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.Mvc;
|
||||
using Disco.Models.Repository;
|
||||
|
||||
namespace Disco.Web.Extensions
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
using Disco.Models.Repository;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.Mvc;
|
||||
using Disco.Models.Repository;
|
||||
|
||||
namespace Disco.Web.Extensions
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
using Disco.Models.Repository;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.Mvc;
|
||||
using Disco.Models.Repository;
|
||||
|
||||
namespace Disco.Web.Extensions
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using System.Collections.Generic;
|
||||
using Disco.Models.Repository;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Disco.Models.Repository;
|
||||
using System.Web.Mvc;
|
||||
|
||||
namespace Disco.Web.Extensions
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Text;
|
||||
using System.Web.Mvc;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace Disco.Web.Extensions
|
||||
{
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using System.Web.Mvc;
|
||||
using System.Web;
|
||||
using System.Web.WebPages;
|
||||
using System.IO;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Web;
|
||||
using System.Web.Mvc;
|
||||
using System.Web.WebPages;
|
||||
|
||||
namespace Disco.Web.Extensions
|
||||
{
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Linq.Expressions;
|
||||
using System.Web.Mvc.Html;
|
||||
using System.Web.Mvc;
|
||||
using System.Web.Mvc.Html;
|
||||
|
||||
namespace Disco.Web.Extensions
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using RazorGenerator.Mvc;
|
||||
using System.Web.Mvc;
|
||||
using System.Web.WebPages;
|
||||
using RazorGenerator.Mvc;
|
||||
|
||||
[assembly: WebActivatorEx.PostApplicationStartMethod(typeof(Disco.Web.RazorGeneratorMvcStart), "Start")]
|
||||
|
||||
|
||||
@@ -1263,7 +1263,8 @@ namespace Disco.Web.Areas.API.Controllers
|
||||
Scope = $"User Detail '{key}' didn't match any users{(string.IsNullOrWhiteSpace(value) ? null : $" with the value '{value}'")}",
|
||||
IsError = true,
|
||||
});
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var user in details.Select(d => d.User).Distinct())
|
||||
{
|
||||
@@ -1431,7 +1432,7 @@ namespace Disco.Web.Areas.API.Controllers
|
||||
UiUrl = handler.GenerationOptionsUi == null ? null : Url.Action(MVC.API.DocumentTemplate.GenerateDocumentHandlerUi(template.Id, target.AttachmentReferenceId, f.Id)),
|
||||
Icon = handler.GenerationOptionsIcon,
|
||||
});
|
||||
};
|
||||
}
|
||||
return Enumerable.Empty<DocumentHandlerModel>();
|
||||
}).ToList();
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using System.Collections.Generic;
|
||||
using Disco.Services.Logging;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Disco.Services.Logging;
|
||||
|
||||
namespace Disco.Web.Areas.API.Models.Logs
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
using Disco.Models.Services.Authorization;
|
||||
using Disco.Models.UI.Config.AuthorizationRole;
|
||||
using Disco.Models.Services.Authorization;
|
||||
using Disco.Web.Areas.API.Models.Shared;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Disco.Web.Areas.Config.Models.AuthorizationRole
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Models.UI.Config.DeviceBatch;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace Disco.Web.Areas.Config.Models.DeviceBatch
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using System;
|
||||
using Disco.Models.UI.Config.DeviceBatch;
|
||||
using System;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using Disco.Models.UI.Config.DeviceBatch;
|
||||
|
||||
namespace Disco.Web.Areas.Config.Models.DeviceBatch
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Models.UI.Config.DeviceModel;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace Disco.Web.Areas.Config.Models.DeviceModel
|
||||
{
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
using System.Collections.Generic;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Models.UI.Config.DocumentTemplate;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using Disco.Data.Repository;
|
||||
using Disco.Models.UI.Config.DocumentTemplate;
|
||||
|
||||
namespace Disco.Web.Areas.Config.Models.DocumentTemplate
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
using Disco.Models.UI.Config.Logging;
|
||||
using Disco.Services.Logging;
|
||||
using Disco.Services.Logging.Models;
|
||||
using Disco.Models.UI.Config.Logging;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Disco.Web.Areas.Config.Models.Logging
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
using Disco.Models.BI.Config;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using Disco.Models.BI.Config;
|
||||
using Disco.Models.UI.Config.Organisation;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace Disco.Web.Areas.Config.Models.Organisation
|
||||
{
|
||||
|
||||
@@ -67,7 +67,8 @@ namespace Disco.Web.Controllers
|
||||
{
|
||||
if (!Request.IsLocal && !ServerIsCoreSKU.Value && !("true".Equals(ConfigurationManager.AppSettings["DiscoAllowRemoteMaintenance"], StringComparison.OrdinalIgnoreCase)))
|
||||
{
|
||||
filterContext.Result = new ContentResult() {
|
||||
filterContext.Result = new ContentResult()
|
||||
{
|
||||
Content = "Initial Configuration of Disco ICT is only allowed via a localhost connection",
|
||||
ContentType = "text/plain"
|
||||
};
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
using System;
|
||||
using Disco.Services.Authorization;
|
||||
using Disco.Services.Interop;
|
||||
using Disco.Services.Plugins;
|
||||
using Disco.Services.Users;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Web.Mvc;
|
||||
using Disco.Services.Plugins;
|
||||
using Disco.Services.Authorization;
|
||||
using Disco.Services.Users;
|
||||
using Disco.Services.Interop;
|
||||
|
||||
namespace Disco.Web.Controllers
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using System.Collections.Generic;
|
||||
using Disco.Models.UI.Device;
|
||||
using Disco.Models.UI.Device;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Disco.Web.Models.Device
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Disco.Models.ClientServices;
|
||||
using Disco.Models.Services.Jobs.Statistics;
|
||||
using Disco.Models.Services.Jobs.JobLists;
|
||||
using Disco.Models.Services.Jobs.Statistics;
|
||||
using Disco.Models.UI.Job;
|
||||
using System.Collections.Generic;
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Data.Entity;
|
||||
using System.Linq;
|
||||
|
||||
namespace Disco.Web.Models.Job
|
||||
{
|
||||
|
||||
@@ -82,7 +82,8 @@ namespace Disco.Web.Models.Job
|
||||
try
|
||||
{
|
||||
UserService.GetUser(jobUserId, Database, true);
|
||||
} catch (Exception) {}
|
||||
}
|
||||
catch (Exception) { }
|
||||
}
|
||||
|
||||
Job = Database.Jobs
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Disco.Models.Services.Searching;
|
||||
using Disco.Models.Services.Jobs.JobLists;
|
||||
using Disco.Models.Services.Jobs.JobLists;
|
||||
using Disco.Models.Services.Searching;
|
||||
using Disco.Models.UI.Search;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
Reference in New Issue
Block a user