From f3340d6cff38e3835c0a95469ae034473bcbe7f7 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Wed, 29 Jan 2025 21:28:03 +0100 Subject: [PATCH 1/3] Added details of additional models builder configuration settings. --- .../reference/configuration/modelsbuildersettings.md | 9 ++++++++- .../reference/configuration/modelsbuildersettings.md | 11 +++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/13/umbraco-cms/reference/configuration/modelsbuildersettings.md b/13/umbraco-cms/reference/configuration/modelsbuildersettings.md index 67bb0f9c2e6..6de288f2375 100644 --- a/13/umbraco-cms/reference/configuration/modelsbuildersettings.md +++ b/13/umbraco-cms/reference/configuration/modelsbuildersettings.md @@ -15,7 +15,8 @@ This section allows you to configure the Umbraco models builder, a complete sect "FlagOutOfDateModels": false, "ModelsDirectory": "~/umbraco/models", "AcceptUnsafeModelsDirectory": false, - "DebugLevel": 0 + "DebugLevel": 0, + "IncludeVersionNumberInGeneratedModels": true } } } @@ -61,3 +62,9 @@ By setting this to true, you specify that the models directory is allowed to be ## Debug level This setting specifies the logging level for the models builder. By default this is set to 0, which means minimal logging. Anything higher that 0 means increased logging. Be aware that this setting should only be set to something higher than 0 for development use, not on live sites. + +## Include version number in generated models + +When source code options are used, the Umbraco version number written to the generated code for each property of the model. This can be useful for debugging purposes but isn't essential. It causes the generated code to change every time Umbraco is upgraded and models are regenerated. In turn, this leads unnecessary code file changes that need to be checked into source control. + +If you prefer to exclude this version number from being written to the generated code, set this value to `false`. \ No newline at end of file diff --git a/15/umbraco-cms/reference/configuration/modelsbuildersettings.md b/15/umbraco-cms/reference/configuration/modelsbuildersettings.md index 1b7f36e5809..ca6f20a61b2 100644 --- a/15/umbraco-cms/reference/configuration/modelsbuildersettings.md +++ b/15/umbraco-cms/reference/configuration/modelsbuildersettings.md @@ -15,7 +15,8 @@ This section allows you to configure the Umbraco models builder, a complete sect "FlagOutOfDateModels": false, "ModelsDirectory": "~/umbraco/models", "AcceptUnsafeModelsDirectory": false, - "DebugLevel": 0 + "DebugLevel": 0, + "IncludeVersionNumberInGeneratedModels": true } } } @@ -34,7 +35,7 @@ Specifies how the models builder will generate models and when to generate them. {% hint style="info" %} When using Models Builder it is best practice to use the "Nothing" setting for all `appsettings.json` files. If needed, the models mode can then be set to "SourceCodeManual" or "SourceCodeAuto" In the `appsettings.json` file used on the local environment. -{% endhint %} +{% endhint %} ## Models namespace @@ -65,3 +66,9 @@ By setting this to true, you specify that the models directory is allowed to be ## Debug level This setting specifies the logging level for the models builder. By default this is set to 0, which means minimal logging. Anything higher that 0 means increased logging. Be aware that this setting should only be set to something higher than 0 for development use, not on live sites. + +## Include version number in generated models + +When source code options are used, the Umbraco version number written to the generated code for each property of the model. This can be useful for debugging purposes but isn't essential. It causes the generated code to change every time Umbraco is upgraded and models are regenerated. In turn, this leads unnecessary code file changes that need to be checked into source control. + +If you prefer to exclude this version number from being written to the generated code, set this value to `false`. \ No newline at end of file From bd474adb478585f2ae9fa0341e98c74bb1300748 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Wed, 5 Feb 2025 12:44:11 +0100 Subject: [PATCH 2/3] Added details of RequireUniqueEmailForMembers setting --- 13/umbraco-cms/reference/configuration/securitysettings.md | 5 +++++ 15/umbraco-cms/reference/configuration/securitysettings.md | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/13/umbraco-cms/reference/configuration/securitysettings.md b/13/umbraco-cms/reference/configuration/securitysettings.md index 3f5aa901065..92a2c85cd6c 100644 --- a/13/umbraco-cms/reference/configuration/securitysettings.md +++ b/13/umbraco-cms/reference/configuration/securitysettings.md @@ -18,6 +18,7 @@ A full configuration with all default values can be seen here: "AuthCookieName": "UMB_UCONTEXT", "AuthCookieDomain": "", "UsernameIsEmail": true, + "RequireUniqueEmailForMembers": true, "UserPassword": { "RequiredLength": 10, "RequireNonLetterOrDigit": false, @@ -72,6 +73,10 @@ The authentication cookie which is set in the browser when a backoffice user log This setting specifies whether the username and email address are separate fields in the backoffice editor. When set to "false", you can specify an email address and username, only the username can be used to log on. When set to "true" (the default value) the username is hidden and always the same as the email address. +### Require unique email for members + +By default Umbraco will not allow creation of more than one member account with the same email address. If you wish to allow this, set this value to `false`. + ## User password settings This section lets you define the password rules for users. diff --git a/15/umbraco-cms/reference/configuration/securitysettings.md b/15/umbraco-cms/reference/configuration/securitysettings.md index 3f5aa901065..92a2c85cd6c 100644 --- a/15/umbraco-cms/reference/configuration/securitysettings.md +++ b/15/umbraco-cms/reference/configuration/securitysettings.md @@ -18,6 +18,7 @@ A full configuration with all default values can be seen here: "AuthCookieName": "UMB_UCONTEXT", "AuthCookieDomain": "", "UsernameIsEmail": true, + "RequireUniqueEmailForMembers": true, "UserPassword": { "RequiredLength": 10, "RequireNonLetterOrDigit": false, @@ -72,6 +73,10 @@ The authentication cookie which is set in the browser when a backoffice user log This setting specifies whether the username and email address are separate fields in the backoffice editor. When set to "false", you can specify an email address and username, only the username can be used to log on. When set to "true" (the default value) the username is hidden and always the same as the email address. +### Require unique email for members + +By default Umbraco will not allow creation of more than one member account with the same email address. If you wish to allow this, set this value to `false`. + ## User password settings This section lets you define the password rules for users. From 1136d9ef74e86d53c569d91cd5753d31086466e8 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Tue, 25 Feb 2025 09:33:02 +0100 Subject: [PATCH 3/3] Fixed configuration key --- 13/umbraco-cms/reference/configuration/securitysettings.md | 4 ++-- 15/umbraco-cms/reference/configuration/securitysettings.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/13/umbraco-cms/reference/configuration/securitysettings.md b/13/umbraco-cms/reference/configuration/securitysettings.md index 92a2c85cd6c..4f2bb1bd022 100644 --- a/13/umbraco-cms/reference/configuration/securitysettings.md +++ b/13/umbraco-cms/reference/configuration/securitysettings.md @@ -18,7 +18,7 @@ A full configuration with all default values can be seen here: "AuthCookieName": "UMB_UCONTEXT", "AuthCookieDomain": "", "UsernameIsEmail": true, - "RequireUniqueEmailForMembers": true, + "MemberRequireUniqueEmail": true, "UserPassword": { "RequiredLength": 10, "RequireNonLetterOrDigit": false, @@ -73,7 +73,7 @@ The authentication cookie which is set in the browser when a backoffice user log This setting specifies whether the username and email address are separate fields in the backoffice editor. When set to "false", you can specify an email address and username, only the username can be used to log on. When set to "true" (the default value) the username is hidden and always the same as the email address. -### Require unique email for members +### Member require unique email By default Umbraco will not allow creation of more than one member account with the same email address. If you wish to allow this, set this value to `false`. diff --git a/15/umbraco-cms/reference/configuration/securitysettings.md b/15/umbraco-cms/reference/configuration/securitysettings.md index 48e7a6c8bb3..c37243554d8 100644 --- a/15/umbraco-cms/reference/configuration/securitysettings.md +++ b/15/umbraco-cms/reference/configuration/securitysettings.md @@ -18,7 +18,7 @@ A full configuration with all default values can be seen here: "AuthCookieName": "UMB_UCONTEXT", "AuthCookieDomain": "", "UsernameIsEmail": true, - "RequireUniqueEmailForMembers": true, + "MemberRequireUniqueEmail": true, "UserPassword": { "RequiredLength": 10, "RequireNonLetterOrDigit": false, @@ -75,7 +75,7 @@ The authentication cookie which is set in the browser when a backoffice user log This setting specifies whether the username and email address are separate fields in the backoffice editor. When set to "false", you can specify an email address and username, only the username can be used to log on. When set to "true" (the default value) the username is hidden and always the same as the email address. -### Require unique email for members +### Member require unique email By default Umbraco will not allow creation of more than one member account with the same email address. If you wish to allow this, set this value to `false`.