paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2608 from Kraeutergarten/filter-fix 

Adds only existing domains in table to the filter and removes additional ajax request.
master
André Peters 2019-05-16 10:56:49 +02:00 committed by GitHub
parent 9eebc7c524 7417dd3a85
commit dac0ea15d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
data/web/js/site/mailbox.js
View File

@ -3,28 +3,18 @@ $(document).ready(function() {
FooTable.domainFilter = FooTable.Filtering.extend({
construct: function(instance){
this._super(instance);
var domain_list = [];
$.ajax({
dataType: 'json',
url: '/api/v1/get/domain/all',
jsonp: false,
async: true,
error: function () {
domain_list.push('Cannot read domain list');
},
success: function (data) {
$.each(data, function (i, item) {
domain_list.push(item.domain_name);
});
}
});
this.domains = domain_list;
this.def = 'All Domains';
this.$domain = null;
},
$create: function(){
this._super();
var self = this,
var self = this;
var domains = [];
$.each(self.ft.rows.all, function(i, row){
if((row.val().domain != null) && ($.inArray(row.val().domain, domains) === -1)) domains.push(row.val().domain);
});
$form_grp = $('<div/>', {'class': 'form-group'})
.append($('<label/>', {'class': 'sr-only', text: 'Domain'}))
.prependTo(self.$form);
@ -33,7 +23,7 @@ $(document).ready(function() {
.append($('<option/>', {text: self.def}))
.appendTo($form_grp);
$.each(self.domains, function(i, domain){
$.each(domains, function(i, domain){
self.$domain.append($('<option/>').text(domain));
});
},