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

better sidebar look and layout

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-23 00:47:17 +00:00
parent 1def41da67
commit 9f9971ff4e
13 changed files with 495 additions and 1367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/App/Netdisco/DB/Result/NetmapPositions.pm
View File

@@ -11,6 +11,8 @@ __PACKAGE__->add_columns(
{ data_type => "integer", is_nullable => 0, is_auto_increment => 1 },
"device_groups",
{ data_type => "text[]", is_nullable => 0 },
"vlan",
{ data_type => "integer", is_nullable => 0, default => 0 },
"positions",
{ data_type => "text", is_nullable => 0 },
);
@@ -18,6 +20,6 @@ __PACKAGE__->add_columns(
__PACKAGE__->set_primary_key("id");
__PACKAGE__->add_unique_constraint(
"netmap_positions_device_groups_key" => ['device_groups']);
"netmap_positions_device_groups_vlan_key" => [qw/device_groups vlan/]);
1;

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

@@ -20,6 +20,9 @@ ajax '/ajax/data/device/netmappositions' => require_login sub {
my $positions = from_json($p) or send_error('Bad positions', 400);
send_error('Bad positions', 400) unless ref [] eq ref $positions;
my $vlan = param('vlan');
undef $vlan if (defined $vlan and $vlan !~ m/^\d+$/);
my %clean = ();
POSITION: foreach my $pos (@$positions) {
next unless ref {} eq ref $pos;
@@ -32,13 +35,15 @@ ajax '/ajax/data/device/netmappositions' => require_login sub {
return unless scalar keys %clean;
my $posrow = schema('netdisco')->resultset('NetmapPositions')->find({
device_groups => \[ '= ?', [device_groups => [sort (List::MoreUtils::uniq( '__ANY__' )) ]] ]});
device_groups => \[ '= ?', [device_groups => [sort (List::MoreUtils::uniq( '__ANY__' )) ]] ],
vlan => ($vlan || 0)});
if ($posrow) {
$posrow->update({ positions => to_json(\%clean) });
}
else {
schema('netdisco')->resultset('NetmapPositions')->create({
device_groups => [sort (List::MoreUtils::uniq( '__ANY__' )) ],
vlan => ($vlan || 0),
positions => to_json(\%clean),
});
}
@@ -99,7 +104,8 @@ ajax '/ajax/data/device/netmap' => require_login sub {
# DEVICES (NODES)
my $posrow = schema('netdisco')->resultset('NetmapPositions')->find({
device_groups => \[ '= ?', [device_groups => [sort (List::MoreUtils::uniq( '__ANY__' )) ]] ]});
device_groups => \[ '= ?', [device_groups => [sort (List::MoreUtils::uniq( '__ANY__' )) ]] ],
vlan => ($vlan || 0)});
my $pos_for = from_json( $posrow ? $posrow->positions : '{}' );
my @devices = schema('netdisco')->resultset('Device')->search({}, {