135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#346 custom reports should allow trailing sql semicolon

Browse Source
This commit is contained in:
Oliver Gorwits
2017-09-21 19:53:56 +01:00
parent d572334a73
commit 5ee0206c91
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/App/Netdisco/Web/GenericReport.pm
View File

@@ -28,8 +28,9 @@ foreach my $report (@{setting('reports')}) {
my $schema = ($report->{database} || 'netdisco'); my $schema = ($report->{database} || 'netdisco');
my $rs = schema($schema)->resultset('Virtual::GenericReport')->result_source; my $rs = schema($schema)->resultset('Virtual::GenericReport')->result_source;
(my $query = $report->{query}) =~ s/;$//;
$rs->view_definition($report->{query}); $rs->view_definition($query);
$rs->remove_columns($rs->columns); $rs->remove_columns($rs->columns);
$rs->add_columns( exists $report->{query_columns} $rs->add_columns( exists $report->{query_columns}
? @{ $report->{query_columns} } ? @{ $report->{query_columns} }