(feat) added the 'add default email addresses' feature in vacation module
This commit is contained in:
parent
fcd0140ffd
commit
9d272ae063
|
@ -16,6 +16,7 @@
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var mailCustomFromEnabled = <var:string value="mailCustomFromEnabled" const:escapeHTML="NO"/>;
|
var mailCustomFromEnabled = <var:string value="mailCustomFromEnabled" const:escapeHTML="NO"/>;
|
||||||
var timeZonesList = <var:string value="timeZonesList" const:escapeHTML="NO"/>;
|
var timeZonesList = <var:string value="timeZonesList" const:escapeHTML="NO"/>;
|
||||||
|
var defaultEmailAddresses = '<var:string value="defaultEmailAddresses" const:escapeHTML="NO"/>';
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script type="text/ng-template" id="preferences.html">
|
<script type="text/ng-template" id="preferences.html">
|
||||||
|
@ -732,16 +733,13 @@
|
||||||
</md-input-container>
|
</md-input-container>
|
||||||
|
|
||||||
<md-input-container>
|
<md-input-container>
|
||||||
<!-- <script>
|
|
||||||
var defaultEmailAddresses = <var:string value="defaultEmailAddresses" const:escapeHTML="NO"/>;
|
|
||||||
</script> -->
|
|
||||||
<label><var:string label:value="Email addresses (separated by commas)"/></label>
|
<label><var:string label:value="Email addresses (separated by commas)"/></label>
|
||||||
<textarea const:name="autoReplyEmailAddresses"
|
<textarea const:name="autoReplyEmailAddresses"
|
||||||
const:id="autoReplyEmailAddresses"
|
const:id="autoReplyEmailAddresses"
|
||||||
ng-model="app.preferences.defaults.Vacation.autoReplyEmailAddresses"/>
|
ng-model="app.preferences.defaults.Vacation.autoReplyEmailAddresses"/>
|
||||||
</md-input-container>
|
</md-input-container>
|
||||||
<div layout="row" layout-align="end center">
|
<div layout="row" layout-align="end center">
|
||||||
<md-button>
|
<md-button ng-click="app.addDefaultEmailAddresses()">
|
||||||
<var:string label:value="Add default email addresses" type="button"/>
|
<var:string label:value="Add default email addresses" type="button"/>
|
||||||
</md-button>
|
</md-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
vm.addMailFilter = addMailFilter;
|
vm.addMailFilter = addMailFilter;
|
||||||
vm.editMailFilter = editMailFilter;
|
vm.editMailFilter = editMailFilter;
|
||||||
vm.removeMailFilter = removeMailFilter;
|
vm.removeMailFilter = removeMailFilter;
|
||||||
|
vm.addDefaultEmailAddresses = addDefaultEmailAddresses;
|
||||||
vm.userFilter = User.$filter;
|
vm.userFilter = User.$filter;
|
||||||
vm.save = save;
|
vm.save = save;
|
||||||
vm.canChangePassword = canChangePassword;
|
vm.canChangePassword = canChangePassword;
|
||||||
|
@ -162,6 +163,16 @@
|
||||||
vm.preferences.defaults.SOGoSieveFilters.splice(index, 1);
|
vm.preferences.defaults.SOGoSieveFilters.splice(index, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addDefaultEmailAddresses() {
|
||||||
|
var v = [];
|
||||||
|
|
||||||
|
if (angular.isDefined(vm.preferences.defaults.Vacation.autoReplyEmailAddresses)) {
|
||||||
|
v = vm.preferences.defaults.Vacation.autoReplyEmailAddresses.split(',');
|
||||||
|
}
|
||||||
|
|
||||||
|
vm.preferences.defaults.Vacation.autoReplyEmailAddresses = (_.union(window.defaultEmailAddresses.split(','), v)).join(',');
|
||||||
|
}
|
||||||
|
|
||||||
function save() {
|
function save() {
|
||||||
vm.preferences.$save();
|
vm.preferences.$save();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue