Merge pull request #219 from fraenki/acme_dialog

security/acme-client: release 1.9
This commit is contained in:
Frank Wall
2017-08-03 16:29:39 +02:00
committed by GitHub
2 changed files with 23 additions and 4 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
PLUGIN_NAME= acme-client
PLUGIN_VERSION= 1.8
PLUGIN_VERSION= 1.9
PLUGIN_COMMENT= Let's Encrypt client
PLUGIN_MAINTAINER= opnsense@moov.de
PLUGIN_DEPENDS= acme.sh
PLUGIN_DEPENDS= acme.sh bind911
.include "../../Mk/plugins.mk"
@@ -119,6 +119,25 @@ POSSIBILITY OF SUCH DAMAGE.
},
};
/**
* standard dialog when confirmation is required, wrapper around BootstrapDialog
*/
function stdDialogConfirmation(message, callback) {
BootstrapDialog.confirm({
title: 'Confirmation Required',
message: message,
type:BootstrapDialog.TYPE_DANGER,
btnCancelLabel: 'Cancel',
btnOKLabel: 'Yes',
btnOKClass: 'btn-primary',
callback: function(result) {
if(result) {
callback();
}
}
});
}
/**
* reload bootgrid, return to current selected page
*/
@@ -315,7 +334,7 @@ POSSIBILITY OF SUCH DAMAGE.
{
if (gridParams['sign'] != undefined) {
var uuid=$(this).data("row-id");
stdDialogRemoveItem('Forcefully (re-)issue the selected certificate?',function() {
stdDialogConfirmation('Forcefully (re-)issue the selected certificate?',function() {
// Handle HAProxy integration (no-op if not applicable)
ajaxCall(url="/api/acmeclient/settings/fetchHAProxyIntegration", sendData={}, callback=function(data,status) {
ajaxCall(url=gridParams['sign'] + uuid,sendData={},callback=function(data,status){
@@ -335,7 +354,7 @@ POSSIBILITY OF SUCH DAMAGE.
{
if (gridParams['revoke'] != undefined) {
var uuid=$(this).data("row-id");
stdDialogRemoveItem('Revoke selected certificate?',function() {
stdDialogConfirmation('Revoke selected certificate?',function() {
ajaxCall(url=gridParams['revoke'] + uuid,
sendData={},callback=function(data,status){
// reload grid after sign