jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Rework the email domain and alias handling for user edits to fix various bugs

Browse Source
This commit is contained in:
Johannes Zellner
2018-01-26 15:39:35 +01:00
parent 6a450b7190
commit 1c9052f085
2 changed files with 79 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webadmin/src/views/users.html
View File

@@ -122,7 +122,7 @@
<div ng-hide="useredit.busyFetching" class="form-group">
<label class="control-label">Email address on domains</label>
<div>
<multiselect ng-model="useredit.emailAddresses" options="a for a in useredit.availableEmailAddresses" data-multiple="true"></multiselect>
<multiselect ng-model="useredit.selectedEmailDomains" options="d.address for d in useredit.availableEmailDomains" data-multiple="true"></multiselect>
</div>
</div>
<div class="form-group" ng-show="!useredit.busyFetching && useredit.userInfo.username" ng-class="{ 'has-error': useredit.error.aliases }">
@@ -132,10 +132,10 @@
<small>{{ useredit.error.aliases }}</small>
</div>
<div class="input-group form-inline" ng-repeat="address in useredit.emailAddresses" style="margin-top: 10px;">
<tag-input class="form-group form-control" placeholder="Separate aliases by comma" taglist="useredit.aliases[address]" name="aliases"></tag-input>
<div class="input-group form-inline" ng-repeat="emailDomain in useredit.selectedEmailDomains" style="margin-top: 10px;">
<tag-input class="form-group form-control" placeholder="Separate aliases by comma" taglist="useredit.aliases[emailDomain.address]" name="aliases"></tag-input>
<div class="input-group-addon">
@{{ address.split('@')[1] }}
@{{ emailDomain.domain.domain }}
</div>
</div>
</div>