Removing obsolete StatusMessage

This commit is contained in:
nicolas.dorier 2019-10-31 15:19:38 +09:00
parent 058b768b0a
commit d66e8f2d13
No known key found for this signature in database
GPG key ID: 6618763EF09186FE
33 changed files with 46 additions and 48 deletions

View file

@ -420,7 +420,7 @@ namespace BTCPayServer.Controllers
}
else
{
TempData["StatusMessage"] = "Account created, please confirm your email";
TempData[WellKnownTempData.SuccessMessage] = "Account created, please confirm your email";
return View();
}
}

View file

@ -28,7 +28,7 @@ namespace BTCPayServer.Controllers
[HttpGet("server/files/{fileId?}")]
public async Task<IActionResult> Files(string fileId = null, string statusMessage = null)
{
TempData["StatusMessage"] = statusMessage;
TempData[WellKnownTempData.SuccessMessage] = statusMessage;
var fileUrl = string.IsNullOrEmpty(fileId) ? null : await _FileService.GetFileUrl(Request.GetAbsoluteRootUri(), fileId);
return View(new ViewFilesViewModel()
@ -167,7 +167,7 @@ namespace BTCPayServer.Controllers
[HttpGet("server/storage")]
public async Task<IActionResult> Storage(bool forceChoice = false, string statusMessage = null)
{
TempData["StatusMessage"] = statusMessage;
TempData[WellKnownTempData.SuccessMessage] = statusMessage;
var savedSettings = await _SettingsRepository.GetSettingAsync<StorageSettings>();
if (forceChoice || savedSettings == null)
{
@ -288,11 +288,11 @@ namespace BTCPayServer.Controllers
data.Provider = storageProvider;
data.Configuration = JObject.FromObject(viewModel);
await _SettingsRepository.UpdateSetting(data);
TempData["StatusMessage"] = new StatusMessageModel()
TempData[WellKnownTempData.StatusMessageModel] = new StatusMessageModel()
{
Severity = StatusMessageModel.StatusSeverity.Success,
Message = "Storage settings updated successfully"
}.ToString();
};
return View(viewModel);
}
}

View file

@ -190,6 +190,8 @@ namespace BTCPayServer.Controllers
{
MaintenanceViewModel vm = new MaintenanceViewModel();
vm.CanUseSSH = _sshState.CanUseSSH;
if (!vm.CanUseSSH)
TempData[WellKnownTempData.ErrorMessage] = "Maintenance feature requires access to SSH properly configured in BTCPayServer configuration";
vm.DNSDomain = this.Request.Host.Host;
if (IPAddress.TryParse(vm.DNSDomain, out var unused))
vm.DNSDomain = null;
@ -480,7 +482,7 @@ namespace BTCPayServer.Controllers
}
await _SettingsRepository.UpdateSetting(settings);
TempData["StatusMessage"] = "Policies updated successfully";
TempData[WellKnownTempData.SuccessMessage] = "Policies updated successfully";
return RedirectToAction(nameof(Policies));
}
@ -1005,7 +1007,7 @@ namespace BTCPayServer.Controllers
public async Task<IActionResult> Theme(ThemeSettings settings)
{
await _SettingsRepository.UpdateSetting(settings);
TempData["StatusMessage"] = "Theme settings updated successfully";
TempData[WellKnownTempData.SuccessMessage] = "Theme settings updated successfully";
return View(settings);
}

View file

@ -5,11 +5,11 @@
<section>
<div class="container">
@if (TempData.ContainsKey("StatusMessage"))
@if (TempData.HasStatusMessage())
{
<div class="row">
<div class="col-lg-12 text-center">
<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
<partial name="_StatusMessage" />
</div>
</div>
}

View file

@ -5,11 +5,11 @@
<section>
<div class="container">
@if (TempData.ContainsKey("StatusMessage"))
@if (TempData.HasStatusMessage())
{
<div class="row">
<div class="col-lg-12 text-center">
<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
<partial name="_StatusMessage" />
</div>
</div>
}

View file

@ -6,7 +6,7 @@
}
<partial name="_StatusMessage" for="@TempData["StatusMessage"]"/>
<partial name="_StatusMessage" />
<div class="row">
<div class="col-lg-6">
<div asp-validation-summary="All" class="text-danger"></div>

View file

@ -5,7 +5,7 @@
<h4>Dynamic DNS Service</h4>
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
@if (!this.ViewContext.ModelState.IsValid)
{
<div class="row">

View file

@ -5,7 +5,7 @@
<h4>Dynamic DNS Settings</h4>
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">
<div class="col-md-8">

View file

@ -4,7 +4,7 @@
}
<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">
<div class="col-lg-6">
<div asp-validation-summary="All" class="text-danger"></div>

View file

@ -4,7 +4,7 @@
}
<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">
<div class="col-lg-6">
<div asp-validation-summary="All" class="text-danger"></div>

View file

@ -3,7 +3,7 @@
ViewData.SetActivePageAndTitle(ServerNavPages.Services, $"Storage - Local Filesystem");
}
<partial name="_StatusMessage" for="@TempData["StatusMessage"]"/>
<partial name="_StatusMessage" />
<div class="row">
<div class="col-lg-6">
<div asp-validation-summary="All" class="text-danger"></div>

View file

@ -3,7 +3,7 @@
ViewData.SetActivePageAndTitle(ServerNavPages.Services, $"Storage - Google Cloud Storage");
}
<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">
<div class="col-lg-6">
<div asp-validation-summary="All" class="text-danger"></div>

View file

@ -4,7 +4,7 @@
}
<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
<partial name="_StatusMessage" />
<h4>File Storage</h4>
<div class="form-group">

View file

@ -5,7 +5,7 @@
<h4>Lightning charge service</h4>
<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">
<div class="col-md-6">

View file

@ -5,7 +5,7 @@
<h4>@Model.WalletName</h4>
<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
<partial name="_StatusMessage" />
@if (Model.ShowQR)
{

View file

@ -5,7 +5,7 @@
<h4>LND @Model.ConnectionType</h4>
<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">
<div class="col-md-6">
<div asp-validation-summary="All" class="text-danger"></div>

View file

@ -4,11 +4,7 @@
}
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
@if (!Model.CanUseSSH)
{
<partial name="_StatusMessage" model="@("Error: Maintenance feature requires access to SSH properly configured in BTCPayServer configuration")" />
}
<partial name="_StatusMessage" />
<div class="row">
<div class="col-md-8">

View file

@ -5,7 +5,7 @@
<h4>@Model.WalletName</h4>
<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
<partial name="_StatusMessage" />
@if (Model.ShowQR)
{

View file

@ -4,7 +4,7 @@
}
<partial name="_StatusMessage" for="@TempData["StatusMessage"]"/>
<partial name="_StatusMessage" />
@if (!this.ViewContext.ModelState.IsValid)
{
<div asp-validation-summary="All" class="text-danger"></div>

View file

@ -4,7 +4,7 @@
}
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">

View file

@ -5,7 +5,7 @@
<h4>SSH settings</h4>
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">
<div class="col-md-6">
<div asp-validation-summary="All" class="text-danger"></div>

View file

@ -4,7 +4,7 @@
}
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]"/>
<partial name="_StatusMessage" />
<div class="row">
<div class="col-md-6">
<div asp-validation-summary="All" class="text-danger"></div>

View file

@ -5,7 +5,7 @@
}
<partial name="_StatusMessage" for="@TempData["StatusMessage"]"/>
<partial name="_StatusMessage" />
@if (Model.ShowChangeWarning)
{
<div class="alert alert-danger">

View file

@ -4,7 +4,7 @@
}
<partial name="_StatusMessage" for="@TempData["StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">
<div class="col-lg-6">
<div asp-validation-summary="All" class="text-danger"></div>

View file

@ -4,7 +4,7 @@
ViewData.SetActivePageAndTitle(StoreNavPages.Checkout, "Checkout experience");
}
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">
<div class="col-md-6">

View file

@ -4,7 +4,7 @@
ViewData.SetActivePageAndTitle(StoreNavPages.Rates, "Rates");
}
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">
<div class="col-md-8">

View file

@ -4,7 +4,7 @@
ViewData.SetActivePageAndTitle(StoreNavPages.Users, "Manage users");
}
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">
<div class="col-md-6">

View file

@ -4,7 +4,7 @@
ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Profile");
}
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
<div class="row">
<div class="col-md-6">

View file

@ -5,11 +5,11 @@
<section>
<div class="container">
@if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
@if (TempData.HasStatusMessage())
{
<div class="row">
<div class="col-lg-12 text-center">
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
</div>
</div>
}

View file

@ -5,11 +5,11 @@
<section>
<div class="container">
@if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
@if (TempData.HasStatusMessage())
{
<div class="row">
<div class="col-lg-12 text-center">
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
</div>
</div>
}

View file

@ -4,11 +4,11 @@
ViewData["Title"] = "PSBT";
ViewData.SetActivePageAndTitle(WalletsNavPages.PSBT);
}
@if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
@if (TempData.HasStatusMessage())
{
<div class="row">
<div class="col-md-10 text-center">
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
</div>
</div>
}

View file

@ -4,11 +4,11 @@
ViewData["Title"] = "Wallet settings";
ViewData.SetActivePageAndTitle(WalletsNavPages.Settings);
}
@if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
@if (TempData.HasStatusMessage())
{
<div class="row">
<div class="col-md-10 text-center">
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
</div>
</div>
}

View file

@ -47,11 +47,11 @@
border: 0;
}
</style>
@if (TempData.ContainsKey("TempDataProperty-StatusMessage"))
@if (TempData.HasStatusMessage())
{
<div class="row">
<div class="col-md-10 text-center">
<partial name="_StatusMessage" for="@TempData["TempDataProperty-StatusMessage"]" />
<partial name="_StatusMessage" />
</div>
</div>
}