Merge branch 'master' into em-device-ports-json

Conflicts: Netdisco/share/views/ajax/datatabledefaults.tt
2014-11-16 22:41:02 +00:00
parent 269cbf8708 a8208121c2
commit 7f2a9b7c3b
4 changed files with 7 additions and 0 deletions
--- a/Netdisco/lib/App/Netdisco/Web/GenericReport.pm
+++ b/Netdisco/lib/App/Netdisco/Web/GenericReport.pm
@@ -55,6 +55,7 @@ foreach my $report (@{setting('reports')}) {
      if (request->is_ajax) {
          template 'ajax/report/generic_report.tt',
              { results => \@results,
+                is_custom_report => true,
                headings => [map {values %{$_}} @{$report->{columns}}],
                columns => [map {keys %{$_}} @{$report->{columns}}] },
              { layout => undef };