From e10ee4f520b6d3624afa636a7250b2f9ed742414 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 5 Jan 2013 19:17:18 +0000
Subject: [PATCH] fix sloppy schema spec which broke netmap

---
 Netdisco/Changes                        |  4 ++++
 Netdisco/lib/App/Netdisco/Web/Device.pm | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index 2b210543..879873b4 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -6,6 +6,10 @@
     code and fewer deps)
   * 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
 
   [ENHANCEMENTS]
diff --git a/Netdisco/lib/App/Netdisco/Web/Device.pm b/Netdisco/lib/App/Netdisco/Web/Device.pm
index c36c895e..c7f0a28a 100644
--- a/Netdisco/lib/App/Netdisco/Web/Device.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Device.pm
@@ -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 {
     my $start = param('q');
     return unless $start;
 
-    my @devices = schema->resultset('Device')->search({}, {
+    my @devices = schmea('netdisco')->resultset('Device')->search({}, {
       result_class => 'DBIx::Class::ResultClass::HashRefInflator',
       columns => ['ip', 'dns'],
     })->all;
     var(devices => { map { $_->{ip} => $_->{dns} } @devices });
 
     var(links => {});
-    my $rs = schema->resultset('Virtual::DeviceLinks')->search({}, {
+    my $rs = schmea('netdisco')->resultset('Virtual::DeviceLinks')->search({}, {
       result_class => 'DBIx::Class::ResultClass::HashRefInflator',
     });
 
@@ -150,13 +150,13 @@ get '/ajax/data/device/netmap' => 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',
       columns => ['ip', 'dns'],
     })->all;
     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',
     });