(feat) added the 'add default email addresses' feature in vacation module

pull/100/head
Ludovic Marcotte 2015-08-18 14:57:29 -04:00
parent fcd0140ffd
commit 9d272ae063
2 changed files with 13 additions and 4 deletions

View File

@ -16,6 +16,7 @@
<script type="text/javascript">
var mailCustomFromEnabled = <var:string value="mailCustomFromEnabled" const:escapeHTML="NO"/>;
var timeZonesList = <var:string value="timeZonesList" const:escapeHTML="NO"/>;
var defaultEmailAddresses = '<var:string value="defaultEmailAddresses" const:escapeHTML="NO"/>';
</script>
<script type="text/ng-template" id="preferences.html">
@ -732,16 +733,13 @@
</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>
<textarea const:name="autoReplyEmailAddresses"
const:id="autoReplyEmailAddresses"
ng-model="app.preferences.defaults.Vacation.autoReplyEmailAddresses"/>
</md-input-container>
<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"/>
</md-button>
</div>

View File

@ -27,6 +27,7 @@
vm.addMailFilter = addMailFilter;
vm.editMailFilter = editMailFilter;
vm.removeMailFilter = removeMailFilter;
vm.addDefaultEmailAddresses = addDefaultEmailAddresses;
vm.userFilter = User.$filter;
vm.save = save;
vm.canChangePassword = canChangePassword;
@ -161,6 +162,16 @@
function removeMailFilter(index) {
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() {
vm.preferences.$save();