aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 22:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removing obsolete StatusMessage

Browse Source
This commit is contained in:
nicolas.dorier
2019-10-31 15:19:38 +09:00
parent 058b768b0a
commit d66e8f2d13
33 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Controllers/AccountController.cs
View File

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

8
BTCPayServer/Controllers/ServerController.Storage.cs
View File

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

6
BTCPayServer/Controllers/ServerController.cs
View File

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

4
BTCPayServer/Views/Account/ForgotPassword.cshtml
View File

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

4
BTCPayServer/Views/Account/ResetPassword.cshtml
View File

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

2
BTCPayServer/Views/Server/CreateTemporaryFileUrl.cshtml
View File

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

2
BTCPayServer/Views/Server/DynamicDnsService.cshtml
View File

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

2
BTCPayServer/Views/Server/DynamicDnsServices.cshtml
View File

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

2
BTCPayServer/Views/Server/EditAmazonS3StorageProvider.cshtml
View File

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

2
BTCPayServer/Views/Server/EditAzureBlobStorageStorageProvider.cshtml
View File

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

2
BTCPayServer/Views/Server/EditFilesystemStorageProvider.cshtml
View File

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

2
BTCPayServer/Views/Server/EditGoogleCloudStorageStorageProvider.cshtml
View File

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

2
BTCPayServer/Views/Server/Files.cshtml
View File

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

2
BTCPayServer/Views/Server/LightningChargeServices.cshtml
View File

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

2
BTCPayServer/Views/Server/LightningWalletServices.cshtml
View File

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

2
BTCPayServer/Views/Server/LndServices.cshtml
View File

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

6
BTCPayServer/Views/Server/Maintenance.cshtml
View File

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

2
BTCPayServer/Views/Server/P2PService.cshtml
View File

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

2
BTCPayServer/Views/Server/Policies.cshtml
View File

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

2
BTCPayServer/Views/Server/Rates.cshtml
View File

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

2
BTCPayServer/Views/Server/SSHService.cshtml
View File

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

2
BTCPayServer/Views/Server/Services.cshtml
View File

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

2
BTCPayServer/Views/Server/Storage.cshtml
View File

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

2
BTCPayServer/Views/Server/Theme.cshtml
View File

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

2
BTCPayServer/Views/Stores/CheckoutExperience.cshtml
View File

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

2
BTCPayServer/Views/Stores/Rates.cshtml
View File

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

2
BTCPayServer/Views/Stores/StoreUsers.cshtml
View File

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

2
BTCPayServer/Views/Stores/UpdateStore.cshtml
View File

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

4
BTCPayServer/Views/UserStores/ListStores.cshtml
View File

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

4
BTCPayServer/Views/Wallets/ListWallets.cshtml
View File

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

4
BTCPayServer/Views/Wallets/WalletPSBT.cshtml
View File

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

4
BTCPayServer/Views/Wallets/WalletSettings.cshtml
View File

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

4
BTCPayServer/Views/Wallets/WalletTransactions.cshtml
View File

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