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

Merge branch 'master' into admin-login

Browse Source 
# Conflicts:
#	data/web/js/site/mailbox.js
This commit is contained in:
Marcel Hofer
2019-03-23 21:17:02 +01:00
parent 3d8a46357b 6a13609bf0
commit 7d2289c3a7
12 changed files with 63 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,7 +169,25 @@ $(document).ready(function() {
// $("#active-script").closest('td').css('background-color','#b0f0a0');
// $("#inactive-script").closest('td').css('background-color','#b0f0a0');
// });
$('#addResourceModal').on('shown.bs.modal', function() {
$("#multiple_bookings").val($("#multiple_bookings_select").val());
if ($("#multiple_bookings").val() == "custom") {
$("#multiple_bookings_custom_div").show();
$("#multiple_bookings").val($("#multiple_bookings_custom").val());
}
})
$("#multiple_bookings_select").change(function() {
$("#multiple_bookings").val($("#multiple_bookings_select").val());
if ($("#multiple_bookings").val() == "custom") {
$("#multiple_bookings_custom_div").show();
}
else {
$("#multiple_bookings_custom_div").hide();
}
});
$("#multiple_bookings_custom").bind ("change keypress keyup blur", function () {
$("#multiple_bookings").val($("#multiple_bookings_custom").val());
});
});
@@ -1000,4 +1018,4 @@ jQuery(function($){
draw_tls_policy_table();
draw_transport_maps_table();
});
});