Url.Content publish bug
This commit is contained in:
@ -9,15 +9,15 @@ namespace OI.Metrology.Server.Controllers;
|
||||
public class PagesController : Controller
|
||||
{
|
||||
|
||||
private readonly string _ApiUrl;
|
||||
private readonly bool _IsTestDatabase;
|
||||
private readonly AppSettings _AppSettings;
|
||||
private readonly IMetrologyRepository _MetrologyRepository;
|
||||
|
||||
public PagesController(AppSettings appSettings, IMetrologyRepository metrologyRepository)
|
||||
{
|
||||
_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)
|
||||
@ -26,11 +26,13 @@ public class PagesController : Controller
|
||||
ViewBag.IsTestDatabase = _IsTestDatabase;
|
||||
}
|
||||
|
||||
private string GetApiUrl() => string.IsNullOrEmpty(_AppSettings.ApiUrl) ? Url.Content("~/") : _AppSettings.ApiUrl[0] == '~' ? Url.Content(_AppSettings.ApiUrl) : _AppSettings.ApiUrl;
|
||||
|
||||
[HttpGet]
|
||||
[Route("/")]
|
||||
public IActionResult Index()
|
||||
{
|
||||
ViewBag.ApiUrl = _ApiUrl;
|
||||
ViewBag.ApiUrl = GetApiUrl();
|
||||
return View("AwaitingDispo");
|
||||
}
|
||||
|
||||
@ -39,7 +41,7 @@ public class PagesController : Controller
|
||||
[Route("/Metrology/AwaitingDispo")]
|
||||
public IActionResult AwaitingDispo()
|
||||
{
|
||||
ViewBag.ApiUrl = _ApiUrl;
|
||||
ViewBag.ApiUrl = GetApiUrl();
|
||||
return View();
|
||||
}
|
||||
|
||||
@ -58,7 +60,7 @@ public class PagesController : Controller
|
||||
{
|
||||
m.HeaderAttachmentID = _MetrologyRepository.GetHeaderAttachmentID(tooltypeid, headerid);
|
||||
}
|
||||
ViewBag.ApiUrl = _ApiUrl;
|
||||
ViewBag.ApiUrl = GetApiUrl();
|
||||
return View(m);
|
||||
}
|
||||
|
||||
@ -67,7 +69,7 @@ public class PagesController : Controller
|
||||
[Route("/Metrology/RunHeaders")]
|
||||
public IActionResult RunHeaders()
|
||||
{
|
||||
ViewBag.ApiUrl = _ApiUrl;
|
||||
ViewBag.ApiUrl = GetApiUrl();
|
||||
return View();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user