From 0448f16d7cad467b6d66703e5c76b9c7b12b0d53 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sun, 2 Mar 2014 20:49:00 +0000
Subject: [PATCH] User Reports appear in "My Reports" menu if no category is
 given

---
 Netdisco/Changes                              |  1 +
 .../lib/App/Netdisco/Manual/Configuration.pod | 30 ++++++++-----------
 .../lib/App/Netdisco/Web/GenericReport.pm     |  2 +-
 Netdisco/lib/App/Netdisco/Web/Plugin.pm       |  2 +-
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index c6243f02..dcb7d0bc 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -4,6 +4,7 @@
 
   * Wildcard support on Device Port MAC Search
   * Wildcard support on Node name/MAC Search
+  * User Reports appear in "My Reports" menu if no category is given
 
 2.024003 - 2014-02-27
 
diff --git a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
index 9512c8c7..d12e2bdd 100644
--- a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
+++ b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
@@ -246,11 +246,6 @@ Each key of the C<reports> configuration is an alias for the report, and
 becomes part of the web path. Within the tree you must provide each of the
 keys shown:
 
-=head4 C<category>
-
-Section of the Reports menu where this report will appear. See
-L<WritingPlugins|App::Netdisco::Manual::WritingPlugins> for the full list.
-
 =head4 C<label>
 
 Title for the Report.
@@ -266,6 +261,12 @@ SQL which returns the data. Make sure that the columns are named the same as
 the keys of the C<columns> configuration. Note the way the SQL is specified in
 the example above, using the pipe symbol and then indenting the query text.
 
+=head4 C<category> (optional)
+
+Section of the Reports menu where this report will appear. See
+L<WritingPlugins|App::Netdisco::Manual::WritingPlugins> for the full list.
+If not supplied, reports appear in a I<My Reports> category.
+
 =head3 C<jobqueue_refresh>
 
 Value: Integer Number. Default: 5.
@@ -349,17 +350,13 @@ stanza is simply a friendly name used by Netdisco to refer to the
 configuration.
 
  snmp_auth:
-   -
-     community: public
-   -
+   - community: public
+   - communtiy: mycommunity
      write: true
-     communtiy: mycommunity
-   -
+   - community: mycommunity2
      read: false
      write: true
-     community: mycommunity2
-   -
-     tag: v3example
+   - tag: v3example
      user: netdisco
      auth:
        pass: netdiscokey
@@ -367,21 +364,18 @@ configuration.
      priv:
        pass: netdiscokey2
        proto: DES
-   -
-     tag: v3aclexample
+   - tag: v3aclexample
      user: netdisco2
      only:
        - 192.0.2.0/30
        - 172.20.10.0/24
-   -
-     tag: v2aclexample
+   - tag: v2aclexample
      community: s3kr1t
      read: false
      write: true
      only:
        - 2001:db8::/32
 
-
 For SNMPv1 and SNMPv2, only the C<community> key is required. You can add
 C<read> and/or C<write> restrictions, and an IP restriction using C<only>.
 Giving the stanza a C<tag> name is optional, but recommended.
diff --git a/Netdisco/lib/App/Netdisco/Web/GenericReport.pm b/Netdisco/lib/App/Netdisco/Web/GenericReport.pm
index 4ca17fb0..521e3190 100644
--- a/Netdisco/lib/App/Netdisco/Web/GenericReport.pm
+++ b/Netdisco/lib/App/Netdisco/Web/GenericReport.pm
@@ -16,7 +16,7 @@ foreach my $r (keys %{setting('reports')}) {
   register_report({
     tag => $r,
     label => $report->{label},
-    category => $report->{category},
+    category => ($report->{category} || 'My Reports'),
     provides_csv => true,
   });
 
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin.pm b/Netdisco/lib/App/Netdisco/Web/Plugin.pm
index dc1c2f4f..e07860a4 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin.pm
@@ -17,7 +17,7 @@ set(
   '_admin_order'  => [],
   '_reports_menu' => {},
   '_reports' => {},
-  '_report_order' => [qw/Device Port IP Node VLAN Network Wireless/],
+  '_report_order' => [qw/Device Port IP Node VLAN Network Wireless/, 'My Reports'],
 );
 
 # this is what Dancer::Template::TemplateToolkit does by default