Skip to content

Commit af56b49

Browse files
author
Marius Burkard
committed
- fixed typo
- hooked ssl and ssl_letsencrypt checkboxes
1 parent 67b0cb3 commit af56b49

File tree

4 files changed

+27
-4
lines changed

4 files changed

+27
-4
lines changed

interface/web/sites/templates/web_vhost_domain_edit.htm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,14 @@ <h1><tmpl_var name="list_head_txt"></h1>
206206
</div>
207207
<tmpl_if name="limit_ssl" op="==" value="y"><div class="form-group">
208208
<label class="col-sm-3 control-label">{tmpl_var name='ssl_txt'}</label>
209-
<div class="col-sm-9">
209+
<div class="col-sm-9" data-uncheck-fields="ssl_letsencrypt">
210210
{tmpl_var name='ssl'}
211211
</div>
212212
</div>
213213
<tmpl_if name="limit_ssl_letsencrypt" op="==" value="y">
214214
<div class="form-group">
215215
<label class="col-sm-3 control-label">{tmpl_var name='ssl_letsencrypt_txt'}</label>
216-
<div class="col-sm-9">
216+
<div class="col-sm-9" data-check-fields="ssl">
217217
{tmpl_var name='ssl_letsencrypt'}
218218
</div>
219219
</div></tmpl_if>

interface/web/sites/web_vhost_domain_edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ function onSubmit() {
10211021
if($client['limit_wildcard'] != 'y' && $this->dataRecord['subdomain'] == '*') $this->dataRecord['subdomain'] = 'n';
10221022
if($client['limit_ssl'] != 'y') $this->dataRecord['ssl'] = 'n';
10231023
if($client['limit_ssl_letsencrypt'] != 'y') $this->dataRecord['ssl_letsencrypt'] = 'n';
1024-
if($client['limit_directive_snippets'] != 'y') $this->dataRecord['directive_snippets_id'] = 0
1024+
if($client['limit_directive_snippets'] != 'y') $this->dataRecord['directive_snippets_id'] = 0;
10251025

10261026
// only generate quota and traffic warnings if value has changed
10271027
if($this->id > 0) {

interface/web/themes/default/assets/javascripts/ispconfig.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,29 @@ $(document).on("click", ".addPlaceholderContent", function(){
702702
template2.insertAtCaret(placeholderContentText);
703703
});
704704

705+
$(document).on("click", "[data-check-fields] > input[type='checkbox']", function() {
706+
if($(this).is(':checked')) {
707+
var flds = $(this).parent().attr('data-check-fields');
708+
var tmp = flds.split(/,/);
709+
for(var i = 0; i < tmp.length; i++) {
710+
var fname = tmp[i];
711+
$('input[type="checkbox"][name="' + fname + '"]').prop('checked', true);
712+
}
713+
}
714+
});
715+
716+
$(document).on("click", "[data-uncheck-fields] > input[type='checkbox']", function() {
717+
if($(this).is(':checked') == false) {
718+
var flds = $(this).parent().attr('data-uncheck-fields');
719+
var tmp = flds.split(/,/);
720+
for(var i = 0; i < tmp.length; i++) {
721+
var fname = tmp[i];
722+
$('input[type="checkbox"][name="' + fname + '"]').prop('checked', false);
723+
}
724+
}
725+
});
726+
727+
705728
$(document).on('ready', function () {
706729
$.fn.extend({
707730
insertAtCaret: function(myValue){

interface/web/themes/default/assets/javascripts/ispconfig.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)