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

Display port descriptions in topology editing forms

Browse Source
This commit is contained in:
Oliver Gorwits
2013-08-24 16:44:59 +01:00
parent c968f2ec96
commit d0a6013b63
5 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Netdisco/lib/App/Netdisco/DB/Result/Topology.pm
View File

@@ -22,4 +22,14 @@ __PACKAGE__->add_columns(
__PACKAGE__->add_unique_constraint(['dev1','port1']);
__PACKAGE__->add_unique_constraint(['dev2','port2']);
__PACKAGE__->belongs_to(
device1 => 'App::Netdisco::DB::Result::Device',
{'foreign.ip' => 'self.dev1'}
);
__PACKAGE__->belongs_to(
device2 => 'App::Netdisco::DB::Result::Device',
{'foreign.ip' => 'self.dev2'}
);
1;

9
Netdisco/lib/App/Netdisco/Web/TypeAhead.pm
View File

@@ -26,7 +26,7 @@ ajax '/ajax/data/deviceip/typeahead' => require_login sub {
$label = sprintf '%s (%s)',
($d->dns || $d->name), $d->ip;
}
push @data, {label => $label, value => $d->ip};
push @data, { label => $label, value => $d->ip };
}
content_type 'application/json';
@@ -46,10 +46,13 @@ ajax '/ajax/data/port/typeahead' => require_login sub {
$set = $set->search({port => { -ilike => "\%$port\%" }})
if $port;
my $results = [ sort { &App::Netdisco::Util::Web::sort_port($a->port, $b->port) } $set->all ];
my $results = [
map {{ label => (sprintf "%s (%s)", $_->port, $_->name), value => $_->port }}
sort { &App::Netdisco::Util::Web::sort_port($a->port, $b->port) } $set->all
];
content_type 'application/json';
to_json [map {$_->port} @$results];
to_json \@$results;
};
true;