phares3757/oi-metrology
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Url.Content publish bug

Browse Source
This commit is contained in:
Mike Phares
2023-02-24 11:18:35 -07:00
parent a25dc93610
commit f3d199cccb
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Server/Controllers/ExportController.cs
View File

@ -12,10 +12,9 @@ namespace OI.Metrology.Server.Controllers;
public class ExportController : Controller
{
private readonly string _ApiUrl;
private readonly ILogger _Logger;
private readonly bool _IsTestDatabase;
private readonly AppSettings _AppSettings;
private readonly bool _IsTestDatabase;
private readonly IMetrologyRepository _MetrologyRepository;
public ExportController(AppSettings appSettings, ILogger<ExportController> logger, IMetrologyRepository metrologyRepository)
@ -24,7 +23,6 @@ public class ExportController : Controller
_AppSettings = appSettings;
_MetrologyRepository = metrologyRepository;
_IsTestDatabase = appSettings.ConnectionString.Contains("test", StringComparison.InvariantCultureIgnoreCase);
_ApiUrl = string.IsNullOrEmpty(appSettings.ApiUrl) ? Url.Content("~/") : appSettings.ApiUrl[0] == '~' ? Url.Content(appSettings.ApiUrl) : appSettings.ApiUrl;
}
public override void OnActionExecuted(ActionExecutedContext context)
@ -33,6 +31,8 @@ public class ExportController : Controller
ViewBag.IsTestDatabase = _IsTestDatabase;
}
private string GetApiUrl() => string.IsNullOrEmpty(_AppSettings.ApiUrl) ? Url.Content("~/") : _AppSettings.ApiUrl[0] == '~' ? Url.Content(_AppSettings.ApiUrl) : _AppSettings.ApiUrl;
[HttpGet]
[Route("/Export")]
public ActionResult Index()
@ -44,7 +44,7 @@ public class ExportController : Controller
};
MonIn monIn = MonIn.GetInstance();
_ = monIn.SendStatus(_AppSettings.MonASite, _AppSettings.MonAResource, "Heartbeat", State.Up);
ViewBag.ApiUrl = _ApiUrl;
ViewBag.ApiUrl = GetApiUrl();
return View(model);
}
@ -85,7 +85,7 @@ public class ExportController : Controller
_ = monIn.SendStatus(_AppSettings.MonASite, _AppSettings.MonAResource, "Heartbeat", State.Warning);
}
}
ViewBag.ApiUrl = _ApiUrl;
ViewBag.ApiUrl = GetApiUrl();
return View("Index", model);
}