yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2171 from umbraco/temp-U4-10368

Browse Source 
U4-10368 Need option to set username different than e-mail for AD compatibility
This commit is contained in:
Mikkel Holck Madsen
2017-09-06 10:59:23 +02:00
committed by GitHub
parent dfa1a098c8 f3f31f2569
commit b9baeea1a1
12 changed files with 122 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
View File

@@ -15,7 +15,7 @@
vm.labels = {};
vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";
vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
vm.emailIsUsername = true;
vm.usernameIsEmail = Umbraco.Sys.ServerVariables.umbracoSettings.usernameIsEmail;
//create the initial model for change password
vm.changePasswordModel = {
@@ -68,7 +68,7 @@
setUserDisplayState();
formatDatesToLocal(vm.user);
vm.emailIsUsername = user.email === user.username;
vm.usernameIsEmail = Umbraco.Sys.ServerVariables.umbracoSettings.usernameIsEmail && user.email === user.username;
//go get the config for the membership provider and add it to the model
authResource.getMembershipProviderConfig().then(function (data) {

4
src/Umbraco.Web.UI.Client/src/views/users/user.html
View File

@@ -43,11 +43,11 @@
<span class="help-inline" val-msg-for="email" val-toggle-msg="valServerField"></span>
</umb-control-group>
<umb-control-group label="@general_username" ng-if="!vm.emailIsUsername" required="true">
<umb-control-group label="@general_username" ng-if="!vm.usernameIsEmail" required="true">
<input
type="text"
localize="placeholder"
placeholder="@placeholders_entername"
placeholder="@placeholders_enterusername"
class="input-block-level"
ng-model="vm.user.username"
umb-auto-focus name="username"

2
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
View File

@@ -26,6 +26,8 @@
vm.selectedBulkUserGroups = [];
vm.usernameIsEmail = Umbraco.Sys.ServerVariables.umbracoSettings.usernameIsEmail;
vm.allowDisableUser = true;
vm.allowEnableUser = true;
vm.allowUnlockUser = true;

7
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
View File

@@ -325,6 +325,13 @@
<span class="help-inline" val-msg-for="name" val-toggle-msg="valServerField"></span>
</umb-control-group>
<umb-control-group label="@general_username" label-for="username" required="true" ng-if="!vm.usernameIsEmail">
<input type="text" name="username" localize="placeholder" placeholder="@placeholders_enterusername" class="input-block-level"
ng-model="vm.newUser.username" val-server-field="Username" ng-required="vm.usernameIsEmail" />
<span class="help-inline" val-msg-for="username" val-toggle-msg="required"><localize key="general_required">Required</localize></span>
<span class="help-inline" val-msg-for="username" val-toggle-msg="valServerField"></span>
</umb-control-group>
<umb-control-group label="@general_email" label-for="email" required="true">
<input type="email" name="email" localize="placeholder" placeholder="@placeholders_enteremail" class="input-block-level"
ng-model="vm.newUser.email" required val-email val-server-field="Email" />