Skip to content

Commit 12cfb21

Browse files
committed
Fix hestiacp#2021 Checkbox of Additional FTP accounts didn't work
+ Add link to show certifcate if LE is enabled
1 parent f406d06 commit 12cfb21

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

web/js/pages/edit_web.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ App.Actions.WEB.remove_ftp_user = function(elm) {
143143

144144
if ($('.ftptable-nrm:visible').length == 0) {
145145
$('.add-new-ftp-user-button').hide();
146-
$('input[name="v_ftp"]').attr('checked', false);
146+
$('input[name="v_ftp"]').prop('checked', false);
147147
}
148148
}
149149

150150
App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
151-
if ($(elm).attr('checked')) {
151+
if ($(elm).prop('checked')) {
152152
$('.ftptable-nrm, .v-add-new-user, .add-new-ftp-user-button').show();
153153
$('.ftptable-nrm').each(function(i, elm) {
154154
var login = $(elm).find('.v-ftp-user');
@@ -177,7 +177,8 @@ App.Actions.WEB.toggle_ssl = function (elm){
177177
}
178178

179179
App.Actions.WEB.toggle_letsencrypt = function(elm) {
180-
if ($(elm).attr('checked')) {
180+
if ($(elm).prop('checked')) {
181+
$('#ssl-details').hide();
181182
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled');
182183
$('#generate-csr').hide();
183184
if(!$('.lets-encrypt-note').hasClass('enabled')){
@@ -187,6 +188,7 @@ App.Actions.WEB.toggle_letsencrypt = function(elm) {
187188
else {
188189
$('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled');
189190
$('#generate-csr').show();
191+
$('#ssl-details').show();
190192
$('.lets-encrypt-note').hide();
191193
}
192194
}

web/templates/pages/edit_web.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
<table style="display:<?php if ($v_ssl == 'no' ) { echo 'none';} else {echo 'block';}?> ;" id="ssltable">
225225
<tr>
226226
<td class="input-label vst-text">
227-
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" id="letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="elementHideShow('ssl-details');App.Actions.WEB.toggle_letsencrypt(this)"><?=_('Lets Encrypt Support');?></label>
227+
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_letsencrypt" id="letsencrypt" <?php if($v_letsencrypt == 'yes' || $v_letencrypt == 'on') echo "checked=yes" ?> onclick="elementHideShow('letsinfo');App.Actions.WEB.toggle_letsencrypt(this)"><?=_('Lets Encrypt Support');?></label>
228228
</td>
229229
</tr>
230230
<tr>
@@ -350,6 +350,9 @@
350350
<?=$v_ssl_issuer?>
351351
</td>
352352
</tr>
353+
<tr id="letsinfo" style="display:<?php if ($v_letsencrypt == 'yes' || $v_letencrypt == 'on' ) { echo 'block';} else {echo 'none';} ?>">
354+
<td><a href="#" onclick="elementHideShow('ssl-details'); return false;" class="generate"><?=_('Show Certifcate');?></a></td>
355+
</tr>
353356
</table>
354357
</td>
355358
</tr>

0 commit comments

Comments
 (0)