diff --git a/Disco.Services/Plugins/UpdatePluginsAfterDiscoUpdateTask.cs b/Disco.Services/Plugins/UpdatePluginsAfterDiscoUpdateTask.cs index 939123b0..fdd2156d 100644 --- a/Disco.Services/Plugins/UpdatePluginsAfterDiscoUpdateTask.cs +++ b/Disco.Services/Plugins/UpdatePluginsAfterDiscoUpdateTask.cs @@ -16,10 +16,10 @@ namespace Disco.Services.Plugins { Status.UpdateStatus(0, "Updating plugins after Disco ICT update", "Starting, please wait..."); - // Wait for App to Load (10 Seconds) - for (int i = 0; i < 10; i++) + // Wait for App to Load (3 Seconds) + for (int i = 0; i < 3; i++) { - Status.UpdateStatus(10 * i); + Status.UpdateStatus(33 * i); System.Threading.Thread.Sleep(1000); } diff --git a/Disco.Web/Controllers/UpdateController.cs b/Disco.Web/Controllers/UpdateController.cs index 0fc3d90b..f8323576 100644 --- a/Disco.Web/Controllers/UpdateController.cs +++ b/Disco.Web/Controllers/UpdateController.cs @@ -1,6 +1,4 @@ using Disco.Services.Plugins; -using System; -using System.Configuration; using System.Web.Mvc; namespace Disco.Web.Controllers @@ -8,19 +6,6 @@ namespace Disco.Web.Controllers [OutputCache(Duration = 0, Location = System.Web.UI.OutputCacheLocation.None)] public partial class UpdateController : Controller { - protected override void OnActionExecuting(ActionExecutingContext filterContext) - { - if (!Request.IsLocal && !InitialConfigController.ServerIsCoreSKU.Value && !("true".Equals(ConfigurationManager.AppSettings["DiscoIgnoreVersionUpdate"], StringComparison.OrdinalIgnoreCase))) - { - filterContext.Result = new ContentResult() - { - Content = "Maintenance of Disco ICT is only allowed via a localhost connection", - ContentType = "text/plain" - }; - } - base.OnActionExecuting(filterContext); - } - public virtual ActionResult Index() { var status = UpdatePluginsAfterDiscoUpdateTask.UpdateDiscoPlugins(true);