From 5f9065b75330c7ed73a062d947a5fb54b69ab868 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Wed, 24 Jul 2013 23:48:48 +0100
Subject: [PATCH] release 2.010004

---
 Netdisco/Changes                              |  6 ++++++
 Netdisco/META.yml                             |  2 +-
 Netdisco/lib/App/Netdisco.pm                  |  4 ++--
 Netdisco/share/public/javascripts/netdisco.js | 12 +++++++-----
 TODO                                          |  6 ++++++
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index 2d54a8cd..35c42d87 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,3 +1,9 @@
+2.010004 - 2013-07-24
+
+  [BUG FIXES]
+
+  * Navbar query box was being cleared sometimes under admin task panels
+
 2.010002 - 2013-07-23
 
   [ENHANCEMENTS]
diff --git a/Netdisco/META.yml b/Netdisco/META.yml
index 98fc99ec..01deb05b 100644
--- a/Netdisco/META.yml
+++ b/Netdisco/META.yml
@@ -60,4 +60,4 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/bsd-license.php
   repository: git://git.code.sf.net/p/netdisco/netdisco-ng
-version: 2.010002
+version: 2.010004
diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm
index 4590027a..8eeb82bc 100644
--- a/Netdisco/lib/App/Netdisco.pm
+++ b/Netdisco/lib/App/Netdisco.pm
@@ -7,7 +7,7 @@ use 5.010_000;
 use File::ShareDir 'dist_dir';
 use Path::Class;
 
-our $VERSION = '2.010002';
+our $VERSION = '2.010004';
 
 BEGIN {
   if (not ($ENV{DANCER_APPDIR} || '')
@@ -190,7 +190,7 @@ Run the following command to start the web-app server as a backgrounded daemon
 
 If the Inventory is empty because this is a new installation, you probably
 want to either run some polling jobs from the command-line, or give a web user
-some admin rights (see L</"User Rights">, below).
+some admin rights (TODO: user rights management).
 
 Run the following command to start the job control daemon (port control, etc):
 
diff --git a/Netdisco/share/public/javascripts/netdisco.js b/Netdisco/share/public/javascripts/netdisco.js
index e84db360..16bacf37 100644
--- a/Netdisco/share/public/javascripts/netdisco.js
+++ b/Netdisco/share/public/javascripts/netdisco.js
@@ -16,12 +16,14 @@ function do_search (event, tab) {
   // each sidebar search form has a hidden copy of the main navbar search
   // query. when the tab query takes place, copy the navbar locally, then
   // replicate to all other tabs.
-  if ($('#nq').val()) {
-    $(form).find("input[name=q]").val( $('#nq').val() );
+  if (path != 'report' && path != 'admin') {
+    if ($('#nq').val()) {
+      $(form).find("input[name=q]").val( $('#nq').val() );
+    }
+    $('form').find("input[name=q]").each( function() {
+      $(this).val( $(form).find("input[name=q]").val() );
+    });
   }
-  $('form').find("input[name=q]").each( function() {
-    $(this).val( $(form).find("input[name=q]").val() );
-  });
 
   // hide or show sidebars depending on previous state,
   // and whether the sidebar contains any content (detected by TT)
diff --git a/TODO b/TODO
index 65bf08ca..44b36604 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,10 @@
 FRONTEND
 ========
 
+* report on port usage
+* SSL support
+* user management admin task
+
 * moar reports
 * (jeneric) device module tab
 
@@ -21,6 +25,8 @@ CORE
 DOCS
 ====
 
+* missing user management ("User Rights")
+
 * Scheduler
 * Discover/Refresh jobs
 * new X:: plugin namespace