7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Compose] Enable some minimal inits, change or remove some health checks

Browse Source
This commit is contained in:
andryyy
2017-09-16 13:17:37 +02:00
parent c63fb8b11a
commit 8741b5f3b1
10 changed files with 120 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/web/js/api.js
View File

@@ -67,7 +67,7 @@ $(document).ready(function() {
var req_empty = false;
$(this).closest("form").find('select, textarea, input').each(function() {
if ($(this).prop('required')) {
if (!$(this).val()) {
if (!$(this).val() && $(this).prop('disabled') === false) {
req_empty = true;
$(this).addClass('inputMissingAttr');
} else {
@@ -126,7 +126,7 @@ $(document).ready(function() {
var req_empty = false;
$(this).closest("form").find('select, textarea, input').each(function() {
if ($(this).prop('required')) {
if (!$(this).val()) {
if (!$(this).val() && $(this).prop('disabled') === false) {
req_empty = true;
$(this).addClass('inputMissingAttr');
} else {

14
data/web/js/edit.js
View File

@@ -1,3 +1,17 @@
$(document).ready(function() {
if ($("#goto_null").is(":checked")) {
$('#textarea_alias_goto').prop('disabled', true);
}
$("#goto_null").click(function( event ) {
if ($("#goto_null").is(":checked")) {
$('#textarea_alias_goto').prop('disabled', true);
}
else {
$("#textarea_alias_goto").removeAttr('disabled');
}
});
});
jQuery(function($){
// http://stackoverflow.com/questions/46155/validate-email-address-in-javascript
function validateEmail(email) {

12
data/web/js/mailbox.js
View File

@@ -30,6 +30,15 @@ $(document).ready(function() {
$('#password2').val(random_passwd);
});
$("#goto_null").click(function( event ) {
if ($("#goto_null").is(":checked")) {
$('#textarea_alias_goto').prop('disabled', true);
}
else {
$("#textarea_alias_goto").removeAttr('disabled');
}
});
// Log modal
$('#logModal').on('show.bs.modal', function(e) {
var logText = $(e.relatedTarget).data('log-text');
@@ -283,6 +292,9 @@ jQuery(function($){
if (item.is_catch_all == 1) {
item.address = '<div class="label label-default">Catch-All</div> ' + item.address;
}
if (item.goto == "null@localhost") {
item.goto = '⤷ <span style="font-size:12px" class="glyphicon glyphicon-trash" aria-hidden="true"></span>';
}
if (item.in_primary_domain !== "") {
item.domain = "↳ " + item.domain + " (" + item.in_primary_domain + ")";
}