qol: make Online Services Connect more reliable
This commit is contained in:
@@ -70,6 +70,14 @@ namespace Disco.Web.Areas.API.Controllers
|
||||
return RedirectToAction(MVC.Config.Logging.TaskStatus(ts.SessionId));
|
||||
}
|
||||
|
||||
[HttpPost, ValidateAntiForgeryToken, DiscoAuthorize(Claims.Config.System.Show)]
|
||||
public virtual ActionResult OnlineServicesConnectStart()
|
||||
{
|
||||
OnlineServicesConnect.QueueStart();
|
||||
|
||||
return RedirectToAction(MVC.Config.SystemConfig.Index());
|
||||
}
|
||||
|
||||
#region Organisation
|
||||
|
||||
#region Organisation Name
|
||||
|
||||
@@ -120,7 +120,7 @@ namespace Disco.Web.Areas.Config.Models.SystemConfig
|
||||
public bool IsActivated { get; set; }
|
||||
public DateTime? ActivatedOn { get; set; }
|
||||
public string ActivatedBy { get; set; }
|
||||
public string OnlineServicesState { get; set; }
|
||||
public OnlineServicesConnect.ConnectionState OnlineServicesState { get; set; }
|
||||
|
||||
public ScheduledTaskStatus UpdateRunningStatus { get; set; }
|
||||
public DateTime? UpdateNextScheduled { get; set; }
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
@model Disco.Web.Areas.Config.Models.SystemConfig.IndexModel
|
||||
@using Disco.Services.Interop.DiscoServices
|
||||
@{
|
||||
Authorization.Require(Claims.Config.System.Show);
|
||||
|
||||
@@ -83,18 +84,23 @@
|
||||
|
||||
switch (Model.OnlineServicesState)
|
||||
{
|
||||
case "Disconnected":
|
||||
case OnlineServicesConnect.ConnectionState.Disconnected:
|
||||
<div class="info-box error">
|
||||
<p class="fa-p"><i class="fa fa-globe"></i> Disconnected from Online Services</p>
|
||||
@using (Html.BeginForm(MVC.API.System.OnlineServicesConnectStart()))
|
||||
{
|
||||
@Html.AntiForgeryToken()
|
||||
<button type="submit" class="button small">Connect</button>
|
||||
}
|
||||
</div>
|
||||
break;
|
||||
case "Connected":
|
||||
case OnlineServicesConnect.ConnectionState.Connected:
|
||||
<div class="info-box success">
|
||||
<p class="fa-p"><i class="fa fa-globe"></i> Connected to Online Services</p>
|
||||
</div>
|
||||
break;
|
||||
case "Connecting":
|
||||
case "Reconnecting":
|
||||
case OnlineServicesConnect.ConnectionState.Connecting:
|
||||
case OnlineServicesConnect.ConnectionState.Reconnecting:
|
||||
<div class="info-box warning">
|
||||
<p class="fa-p"><i class="fa fa-globe"></i> @Model.OnlineServicesState to Online Services</p>
|
||||
</div>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user