From 4ed7d5717f8ad047f73871efac53c6662d55c2b7 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 7 Jan 2020 16:15:10 +0300
Subject: [PATCH] account mvc  IsSelfRegistrationEnabled

---
 .../src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml      | 5 +++--
 .../Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs    | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
index 94ef0e45a2..fca4622a29 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml
@@ -1,5 +1,6 @@
 @page
 @using Volo.Abp.Account.Settings
+@using Volo.Abp.Settings
 @model Volo.Abp.Account.Web.Pages.Account.LoginModel
 @inherits Volo.Abp.Account.Web.Pages.Account.AccountPage
 @inject Volo.Abp.Settings.ISettingProvider SettingProvider
@@ -7,8 +8,8 @@
 {
     <div class="card mt-3 shadow-sm rounded">
         <div class="card-body p-5">
-            <h4>@L["Login"]</h4> 
-            @if (string.Equals(await SettingProvider.GetOrNullAsync(AccountSettingNames.IsSelfRegistrationEnabled), "true", StringComparison.OrdinalIgnoreCase))
+            <h4>@L["Login"]</h4>
+            @if (await SettingProvider.IsTrueAsync(AccountSettingNames.IsSelfRegistrationEnabled))
             {
                 <strong>
                     @L["AreYouANewUser"]
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
index 4d95613fe1..5abb564b09 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
@@ -45,7 +45,8 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
         protected virtual async Task CheckSelfRegistrationAsync()
         {
-            if (!await SettingProvider.IsTrueAsync(AccountSettingNames.IsSelfRegistrationEnabled).ConfigureAwait(false))
+            if (!await SettingProvider.IsTrueAsync(AccountSettingNames.IsSelfRegistrationEnabled).ConfigureAwait(false) ||
+                !await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin).ConfigureAwait(false))
             {
                 throw new UserFriendlyException(L["SelfRegistrationDisabledMessage"]);
             }