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

fix sloppy schema spec which broke netmap

Browse Source
This commit is contained in:
Oliver Gorwits
2013-01-05 19:17:18 +00:00
parent 214cc8f614
commit e10ee4f520
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netdisco/Changes
View File

@@ -6,6 +6,10 @@
code and fewer deps) code and fewer deps)
* Version bump so that we'll be releasing odd numbered beta dists * Version bump so that we'll be releasing odd numbered beta dists
[BUG FIXES]
* Fix sloppy schema calls which broke netmap
2.00_012 - 2012-12-21 2.00_012 - 2012-12-21
[ENHANCEMENTS] [ENHANCEMENTS]

10
Netdisco/lib/App/Netdisco/Web/Device.pm
View File

@@ -115,19 +115,19 @@ sub _add_children {
} }
} }
# d3 seems not to use proper json semantics, so get instead of ajax # d3 seems not to use proper ajax semantics, so get instead of ajax
get '/ajax/data/device/netmap' => sub { get '/ajax/data/device/netmap' => sub {
my $start = param('q'); my $start = param('q');
return unless $start; return unless $start;
my @devices = schema->resultset('Device')->search({}, { my @devices = schmea('netdisco')->resultset('Device')->search({}, {
result_class => 'DBIx::Class::ResultClass::HashRefInflator', result_class => 'DBIx::Class::ResultClass::HashRefInflator',
columns => ['ip', 'dns'], columns => ['ip', 'dns'],
})->all; })->all;
var(devices => { map { $_->{ip} => $_->{dns} } @devices }); var(devices => { map { $_->{ip} => $_->{dns} } @devices });
var(links => {}); var(links => {});
my $rs = schema->resultset('Virtual::DeviceLinks')->search({}, { my $rs = schmea('netdisco')->resultset('Virtual::DeviceLinks')->search({}, {
result_class => 'DBIx::Class::ResultClass::HashRefInflator', result_class => 'DBIx::Class::ResultClass::HashRefInflator',
}); });
@@ -150,13 +150,13 @@ get '/ajax/data/device/netmap' => sub {
}; };
ajax '/ajax/data/device/alldevicelinks' => sub { ajax '/ajax/data/device/alldevicelinks' => sub {
my @devices = schema->resultset('Device')->search({}, { my @devices = schmea('netdisco')->resultset('Device')->search({}, {
result_class => 'DBIx::Class::ResultClass::HashRefInflator', result_class => 'DBIx::Class::ResultClass::HashRefInflator',
columns => ['ip', 'dns'], columns => ['ip', 'dns'],
})->all; })->all;
var(devices => { map { $_->{ip} => $_->{dns} } @devices }); var(devices => { map { $_->{ip} => $_->{dns} } @devices });
my $rs = schema->resultset('Virtual::DeviceLinks')->search({}, { my $rs = schmea('netdisco')->resultset('Virtual::DeviceLinks')->search({}, {
result_class => 'DBIx::Class::ResultClass::HashRefInflator', result_class => 'DBIx::Class::ResultClass::HashRefInflator',
}); });