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

Make mail list members a textarea

Browse Source 
Also, fix the error handling
This commit is contained in:
Girish Ramakrishnan
2019-09-11 14:09:53 -07:00
parent 758b32a61c
commit 9e2ac31a08
2 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/email.html
View File

@@ -155,11 +155,9 @@
<div class="modal-body">
<form name="mailinglistadd_form" role="form" ng-submit="mailinglists.add.submit()" autocomplete="off">
<input type="password" style="display: none;">
<div class="form-group" ng-class="{ 'has-error': mailinglists.add.error.statusCode === 409 }">
<div class="form-group" ng-class="{ 'has-error': mailinglists.add.error.name }">
<label class="control-label">Name</label>
<div class="control-label" ng-show="mailinglists.add.error.statusCode === 409">
<small>A mailbox of list with this name already exists</small>
</div>
<div class="control-label" ng-show="mailinglists.add.error.name"><small>{{ mailinglists.add.error.name }}</small></div>
<div class="input-group form-inline" style="margin-top: 10px;">
<input type="text" class="form-control" ng-model="mailinglists.add.name" placeholder="Name" required autofocus autocomplete="off"/>
<div class="input-group-addon">@{{ selectedDomain.domain }}</div>
@@ -167,14 +165,15 @@
</div>
<div class="form-group">
<label class="control-label">List Members</label><br/>
<multiselect ng-model="mailinglists.add.members" options="mailbox.name for mailbox in mailboxes.mailboxes" data-compare-by="name" data-multiple="true"></multiselect>
<div class="has-error control-label" ng-show="mailinglists.add.error.members"><small>{{ mailinglists.add.error.members }}</small></div>
<textarea ng-model="mailinglists.add.membersTxt" placeholder="Separate email addresses with a newline" class="form-control" rows="10"></textarea>
</div>
<input class="hide" type="submit" ng-disabled="mailinglistadd_form.$invalid || mailinglists.add.members.length === 0 || mailinglists.add.busy"/>
<input class="hide" type="submit" ng-disabled="mailinglistadd_form.$invalid || mailinglists.add.membersTxt.length === 0 || mailinglists.add.busy"/>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success" ng-click="mailinglists.add.submit()" ng-disabled="mailinglistadd_form.$invalid || mailinglists.add.members.length === 0 || mailinglists.add.busy"><i class="fa fa-circle-notch fa-spin" ng-show="mailinglists.add.busy"></i> Save</button>
<button type="button" class="btn btn-success" ng-click="mailinglists.add.submit()" ng-disabled="mailinglistadd_form.$invalid || mailinglists.add.membersTxt.length === 0 || mailinglists.add.busy"><i class="fa fa-circle-notch fa-spin" ng-show="mailinglists.add.busy"></i> Save</button>
</div>
</div>
</div>
@@ -190,12 +189,10 @@
<div class="modal-body">
<form name="mailinglistedit_form" role="form" ng-submit="mailinglists.edit.submit()" autocomplete="off">
<input type="password" style="display: none;">
<div class="form-group" ng-class="{ 'has-error': mailinglists.edit.error }">
<div class="form-group" ng-class="{ 'has-error': mailinglists.edit.error.members }">
<label class="control-label">List Members</label><br/>
<div class="control-label" ng-show="mailinglists.edit.error">
<small>{{ mailinglists.edit.error.message }}</small>
</div>
<multiselect ng-model="mailinglists.edit.members" options="mailbox.name for mailbox in mailboxes.mailboxes" data-compare-by="name" data-multiple="true" autofocus></multiselect>
<div class="has-error control-label" ng-show="mailinglists.edit.error.members"><small>{{ mailinglists.edit.error.members }}</small></div>
<textarea ng-model="mailinglists.edit.membersTxt" placeholder="Separate email addresses with a newline" class="form-control" rows="10"></textarea>
</div>
<input class="hide" type="submit" ng-disabled="mailinglistedit_form.$invalid || mailinglists.edit.busy"/>
</form>