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

#681 Add href link to a device in a report

Browse Source
This commit is contained in:
Oliver Gorwits
2019-12-21 23:08:02 +00:00
parent 4030000b34
commit 4268fff785
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ use Dancer::Plugin::Auth::Extensible;
use App::Netdisco::Web::Plugin;
use Path::Class 'file';
use Storable 'dclone';
use Safe;
our ($config, @data);
@@ -30,11 +31,24 @@ foreach my $report (@{setting('reports')}) {
my $rs = schema($schema)->resultset('Virtual::GenericReport')->result_source;
(my $query = $report->{query}) =~ s/;$//;
# unpick the rather hairy config of 'columns' to get field,
# displayname, and "_"-prefixed options
my %column_config = ();
my @column_order = ();
foreach my $col (@{ $report->{columns} }) {
foreach my $k (keys %$col) {
if ($k !~ m/^_/) {
push @column_order, $k;
$column_config{$k} = dclone($col || {});
$column_config{$k}->{displayname} = delete $column_config{$k}->{$k};
}
}
}
$rs->view_definition($query);
$rs->remove_columns($rs->columns);
$rs->add_columns( exists $report->{query_columns}
? @{ $report->{query_columns} }
: (map {keys %{$_}} @{$report->{columns}})
? @{ $report->{query_columns} } : @column_order
);
my $set = schema($schema)->resultset('Virtual::GenericReport')
@@ -60,16 +74,17 @@ foreach my $report (@{setting('reports')}) {
template 'ajax/report/generic_report.tt',
{ results => \@results,
is_custom_report => true,
headings => [map {values %{$_}} @{$report->{columns}}],
columns => [map {keys %{$_}} @{$report->{columns}}] },
column_options => \%column_config,
headings => [map {$column_config{$_}->{displayname}} @column_order],
columns => [@column_order] },
{ layout => undef };
}
else {
header( 'Content-Type' => 'text/comma-separated-values' );
template 'ajax/report/generic_report_csv.tt',
{ results => \@results,
headings => [map {values %{$_}} @{$report->{columns}}],
columns => [map {keys %{$_}} @{$report->{columns}}] },
headings => [map {$column_config{$_}->{displayname}} @column_order],
columns => [@column_order] },
{ layout => undef };
}
};

6
share/views/ajax/report/generic_report.tt
View File

@@ -10,7 +10,13 @@
[% FOREACH row IN results %]
<tr>
[% FOREACH col IN columns %]
[% IF column_options.$col._searchable %]
<td>
<a href="[% uri_for('/search') | none %]?q=[% row.item(col) | uri %]">[% row.item(col) | html_entity %]</a>
</td>
[% ELSE %]
<td>[% row.item(col) | html_entity %]</td>
[% END %]
[% END %]
</tr>
[% END %]