From 622bd629cbf7243c64e1a03b8cec62626ba811b5 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Mon, 23 Sep 2013 20:00:50 +0100
Subject: [PATCH] rename no_port_control to check_userlog

---
 Netdisco/lib/App/Netdisco/Manual/Configuration.pod       | 9 +++++----
 Netdisco/share/config.yml                                | 2 +-
 .../share/public/javascripts/netdisco_portcontrol.js     | 2 +-
 Netdisco/share/views/layouts/main.tt                     | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
index a8ef9cc3..591e19bb 100644
--- a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
+++ b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
@@ -532,12 +532,13 @@ Interfaces too)
 B<EXTREMELY VERY DANGEROUS>: Turning off uplinks will take out chunks of your
 network.
 
-=head3 C<no_port_control>
+=head3 C<check_userlog>
 
-Value: Boolean. Default: C<false>.
+Value: Boolean. Default: C<true>.
 
-Set to true to disable globally support for Port Control. Mainly useful for
-development to suppress web frontend job queue callbacks.
+Set to false to disable the periodic AJAX check for completed entries in the
+job queue for this user. Mainly useful for development to suppress noisy web
+frontend activity.
 
 =head2 Backend Daemon
 
diff --git a/Netdisco/share/config.yml b/Netdisco/share/config.yml
index 08702de9..19284c17 100644
--- a/Netdisco/share/config.yml
+++ b/Netdisco/share/config.yml
@@ -107,7 +107,7 @@ vlanctl: true
 portctl_nophones: false
 portctl_vlans: false
 portctl_uplinks: false
-no_port_control: false
+check_userlog: true
 
 # --------------
 # BACKEND DAEMON
diff --git a/Netdisco/share/public/javascripts/netdisco_portcontrol.js b/Netdisco/share/public/javascripts/netdisco_portcontrol.js
index 5009ae7f..21f6f561 100644
--- a/Netdisco/share/public/javascripts/netdisco_portcontrol.js
+++ b/Netdisco/share/public/javascripts/netdisco_portcontrol.js
@@ -66,7 +66,7 @@ function port_control (e) {
 // on load, establish global delegations for now and future
 $(document).ready(function() {
   // for growl-like functionality, check for notifications periodically
-  if (nd_port_control) {
+  if (nd_check_userlog) {
     (function worker() {
       $.ajax({
         url: uri_base + '/ajax/userlog'
diff --git a/Netdisco/share/views/layouts/main.tt b/Netdisco/share/views/layouts/main.tt
index d76c6c1d..24b2d131 100644
--- a/Netdisco/share/views/layouts/main.tt
+++ b/Netdisco/share/views/layouts/main.tt
@@ -26,7 +26,7 @@
 
   <script type="text/javascript">
     var uri_base = '[% uri_base %]';
-    var nd_port_control = '[% NOT settings.no_port_control %]';
+    var nd_check_userlog = '[% settings.check_userlog %]';
   </script>
   <script type="text/javascript" src="[% uri_base %]/javascripts/netdisco.js"></script>