From 23bb90918c27ef3b7ed877a1e7366e9dbd1be025 Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Thu, 22 Mar 2018 18:00:29 +0100 Subject: [PATCH 1/2] net/wol: more user feedback + remove OpenVPN from selection - maybe IPsec too --- .../opnsense/mvc/app/models/OPNsense/Wol/Wol.xml | 1 + .../opnsense/mvc/app/views/OPNsense/Wol/index.volt | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Wol.xml b/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Wol.xml index 544b6c147..64aebce1f 100644 --- a/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Wol.xml +++ b/net/wol/src/opnsense/mvc/app/models/OPNsense/Wol/Wol.xml @@ -10,6 +10,7 @@ /^(?!0).*$/ + /^(?!openvpn|ipsec|enc).*$/i diff --git a/net/wol/src/opnsense/mvc/app/views/OPNsense/Wol/index.volt b/net/wol/src/opnsense/mvc/app/views/OPNsense/Wol/index.volt index 902e7b76b..91d1d7395 100644 --- a/net/wol/src/opnsense/mvc/app/views/OPNsense/Wol/index.volt +++ b/net/wol/src/opnsense/mvc/app/views/OPNsense/Wol/index.volt @@ -62,7 +62,18 @@ $( document ).ready(function() { // link save button to API set action $("#wakeAct").click(function(){ - saveFormToEndpoint(url="/api/wol/wol/set", formid='frm_wol_wake',callback_ok=function(data){}, true); + ajaxCall(url="/api/wol/wol/set", data=getFormData('frm_wol_wake'),callback=function(data, status){ + BootstrapDialog.show({ + type: data.status == 'OK' ? BootstrapDialog.TYPE_SUCCESS : BootstrapDialog.TYPE_DANGER, + title: "{{ lang._("Result") }}", + message: (data.status == 'OK' ? + '{{ lang._('Magic packet was sent successfully.') }}' : + '{{ lang._('The packet was not sent due to an error. Please consult the logs.') }}
' + + $('
').text(data.error_msg).html()
+                     )
+          });
+        
+        }, true);
     });
 });
 

From 7633c14cd97bc026fa029f4724c9357d2cea9d48 Mon Sep 17 00:00:00 2001
From: Fabian Franz 
Date: Thu, 22 Mar 2018 18:28:59 +0100
Subject: [PATCH 2/2] net/wol: bump version

---
 net/wol/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/wol/Makefile b/net/wol/Makefile
index d532d8ce5..a6272d200 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		wol
 PLUGIN_VERSION=		2.0.d
+PLUGIN_REVISION=	1
 PLUGIN_DEPENDS=		wol
 PLUGIN_COMMENT=		Wake on LAN Service
 PLUGIN_MAINTAINER=	franco@opnsense.org