Merge branch 'master' of 10.0.0.83:/usr/local/git/SoftwayWeb

This commit is contained in:
Marco Audiffredi 2024-07-16 15:41:30 +02:00
commit 14d8e0370a
3 changed files with 16 additions and 2 deletions

View File

@ -291,7 +291,7 @@ namespace SoftwayWeb.Controllers
private List<SelectListItem> getAutisti()
{
SessionHelper helper = new SessionHelper(this);
token = helper.GetStringValue("tok");
apiUrl = helper.GetStringValue("apiUrl");
urlBase = apiUrl + "Giri/listaAutisti";
@ -329,6 +329,9 @@ namespace SoftwayWeb.Controllers
private List<SelectListItem> getMezzi()
{
SessionHelper helper = new SessionHelper(this);
token = helper.GetStringValue("tok");
apiUrl = helper.GetStringValue("apiUrl");
urlBase = apiUrl + "Giri/listaAutomezzi";

View File

@ -26,7 +26,16 @@ namespace SoftwayWeb.Controllers
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public IActionResult Error()
{
return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
}
SessionHelper helper = new SessionHelper(this);
string e = helper.GetStringValue("errMsg");
return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier, ErrMsg = e });
}
//[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
//public IActionResult Error()
//{
// return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
//}
}
}

View File

@ -64,6 +64,8 @@
@Html.ActionLink("Seleziona tutti", "Create", "Giri",new { sel = true }, null)
&nbsp;
@Html.ActionLink("Deleziona tutti", "Create", "Giri",new { sel = false }, null)
&nbsp;
<a asp-action="Index" value="Torna alla lista" class="agy-btn submitForm">Torna alla lista</a>
</div>