Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Fixed build warnings related to ModuleMessage component changes

Browse Source
This commit is contained in:
Shaun Walker
2020-10-05 09:11:47 -04:00
parent ece8f3a57e
commit 0c0916c6ab
7 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Oqtane.Client/UI/Installer.razor
View File

@ -119,7 +119,7 @@
<div class="row">
<div class="mx-auto text-center">
<button type="button" class="btn btn-success" @onclick="Install">Install Now</button><br /><br />
<ModuleMessage @ref=_message></ModuleMessage>
<ModuleMessage Message="@_message" Type="MessageType.Error"></ModuleMessage>
</div>
<div class="app-progress-indicator" style="@_loadingDisplay"></div>
</div>
@ -129,13 +129,13 @@
private string _databaseType = "LocalDB";
private string _serverName = "(LocalDb)\\MSSQLLocalDB";
private string _databaseName = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
private string _username = "";
private string _password = "";
private string _username = string.Empty;
private string _password = string.Empty;
private string _hostUsername = Constants.HostUser;
private string _hostPassword = "";
private string _confirmPassword = "";
private string _hostEmail = "";
private ModuleMessage _message = new ModuleMessage();
private string _hostPassword = string.Empty;
private string _confirmPassword = string.Empty;
private string _hostEmail = string.Empty;
private string _message = string.Empty;
private string _integratedSecurityDisplay = "display: none;";
private string _loadingDisplay = "display: none;";
@ -201,15 +201,13 @@
}
else
{
_message.Message = installation.Message;
_message.Type = MessageType.Error;
_message = installation.Message;
_loadingDisplay = "display: none;";
}
}
else
{
_message.Message = "Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length";
_message.Type = MessageType.Error;
_message = "Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length";
}
}

9
Oqtane.Client/UI/ModuleInstance.razor
View File

@ -1,8 +1,7 @@
@namespace Oqtane.UI
<ModuleMessage Message="@_message" Type="MessageType.Error" />
<ModuleMessage Message="@_message" Type="@_messagetype" />
<CascadingValue Value="this">
<ModuleMessage @ref="ModuleMessage" />
@DynamicComponent
</CascadingValue>
@if (_progressindicator)
@ -12,6 +11,7 @@
@code {
private string _message;
private MessageType _messagetype;
private bool _progressindicator = false;
[CascadingParameter]
@ -49,11 +49,13 @@
{
// module does not exist with typename specified
_message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor";
_messagetype = MessageType.Error;
}
}
else
{
_message = "Something is wrong with moduletype";
_messagetype = MessageType.Error;
}
};
@ -61,9 +63,10 @@
public void AddModuleMessage(string message, MessageType type)
{
_message = message;
_messagetype = type;
_progressindicator = false;
StateHasChanged();
ModuleMessage.SetModuleMessage(message, type);
}
public void ShowProgressIndicator()