Send Netdot-devel mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Netdot-devel digest..."
Today's Topics:
1. [SCM] UNNAMED PROJECT branch netdot-1.0 updated.
1154a0f25b5e37704510a30064c456599ef6212b (Apache)
2. [SCM] UNNAMED PROJECT branch netdot-1.0 updated.
647ae3ea5c876f9218ab0e51b0b8a817f3a6d8fb (Apache)
----------------------------------------------------------------------
Message: 1
Date: Mon, 6 Aug 2012 10:55:28 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] UNNAMED PROJECT branch netdot-1.0
updated. 1154a0f25b5e37704510a30064c456599ef6212b
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, netdot-1.0 has been updated
via 1154a0f25b5e37704510a30064c456599ef6212b (commit)
from 18dde13d310f2542521801098e5ca2d194ce65ff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1154a0f25b5e37704510a30064c456599ef6212b
Author: Carlos Vicente <[email protected]>
Date: Mon Aug 6 13:55:07 2012 -0400
VLANs were not being assigned to VLAN groups automatically
diff --git a/htdocs/management/vlan.html b/htdocs/management/vlan.html
index 82b364d..b801d4d 100644
--- a/htdocs/management/vlan.html
+++ b/htdocs/management/vlan.html
@@ -92,7 +92,7 @@ if( $_action eq "INSERT" && !$o ){
</div>
</div>
-% @vlanlist = Vlan->search(vlangroup=>0);
+% @vlanlist = Vlan->search(vlangroup => undef);
<div class="container">
<div class="containerheadleft">Ungrouped VLANs:</div>
<div class="containerheadright">
diff --git a/lib/Netdot/Model/VlanGroup.pm b/lib/Netdot/Model/VlanGroup.pm
index 5c559ed..e53e820 100644
--- a/lib/Netdot/Model/VlanGroup.pm
+++ b/lib/Netdot/Model/VlanGroup.pm
@@ -107,7 +107,7 @@ sub assign_vlans{
# Assing vlans to this new group
foreach my $vlan ( Vlan->retrieve_all ){
if ( $vlan->vid >= $self->start_vid && $vlan->vid <= $self->end_vid ){
- if ( defined $vlan->vlangroup && !($vlan->vlangroup == $self->id) ){
+ if ( !defined $vlan->vlangroup || $vlan->vlangroup != $self->id ){
$vlan->update({vlangroup=>$self->id});
$logger->debug(sub{ sprintf("VlanGroup: %s: Vlan %s within my
range. Updating.",
$self->name, $vlan->vid) });
@@ -116,7 +116,7 @@ sub assign_vlans{
}else{
# Remove from my members if necessary
if ( exists $myvlans{$vlan->id} ){
- $logger->info(sprintf("VlanGroup %s: Vlan %s no longer within
my range. Updating.",
+ $logger->debug(sprintf("VlanGroup %s: Vlan %s no longer within
my range. Updating.",
$vlan->vid, $self->name));
$vlan->update({vlangroup=>undef});
}
-----------------------------------------------------------------------
Summary of changes:
htdocs/management/vlan.html | 2 +-
lib/Netdot/Model/VlanGroup.pm | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
UNNAMED PROJECT
------------------------------
Message: 2
Date: Mon, 6 Aug 2012 11:23:49 -0700
From: Apache <[email protected]>
Subject: [Netdot-devel] [SCM] UNNAMED PROJECT branch netdot-1.0
updated. 647ae3ea5c876f9218ab0e51b0b8a817f3a6d8fb
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, netdot-1.0 has been updated
via 647ae3ea5c876f9218ab0e51b0b8a817f3a6d8fb (commit)
from 1154a0f25b5e37704510a30064c456599ef6212b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 647ae3ea5c876f9218ab0e51b0b8a817f3a6d8fb
Author: Carlos Vicente <[email protected]>
Date: Mon Aug 6 14:23:26 2012 -0400
Make Site search simpler in cable plant section
diff --git a/htdocs/cable_plant/site_tasks.html
b/htdocs/cable_plant/site_tasks.html
index 212d24c..a4af3ad 100644
--- a/htdocs/cable_plant/site_tasks.html
+++ b/htdocs/cable_plant/site_tasks.html
@@ -9,8 +9,7 @@ $showheader => 1
$show_tasks => undef
$site_select => undef
$submit_search => undef
-$search_name => undef
-$search_number => undef
+$search_site => undef
</%args>
@@ -73,12 +72,8 @@ my $manager = $ui->get_permission_manager($r);
</form>
<form name="site_tasks_search_form" action="site_tasks.html"
method="POST">
<p>
- <label for="search">Site Name:</label>
- <input name="search_name" value="<% $search_name %>" >
- </p>
- <p>
- <label for="search">Site ID:</label>
- <input name="search_number" value="<% $search_number %>" >
<input type="submit" name="submit_search" value="Search">
+ <label for="search">Site Search:</label>
+ <input name="search_site" value="<% $search_site %>" >
<input type="submit" name="submit_search" value="Search">
</p>
</form>
</fieldset>
@@ -99,26 +94,17 @@ if ( $site_select ){
$m->comp('/generic/view.html', table=>"Site", id=>$site_select);
}elsif ( $submit_search ){
- my %sargs;
- if ( $search_name ){
- $search_name =~ s/^\s*(.*)\s*$/$1/g; # Remove trailing and leading
spaces
- $sargs{name} = $search_name;
- }
- if ( $search_number ){
- $search_number =~ s/^\s*(.*)\s*$/$1/g;
- $sargs{number} = $search_number;
- }
- @results = Site->search_like(%sargs) if %sargs;
-
- $search = join ' ', %sargs;
+ my $r = Netdot::Model->search_all_tables("Site:".$search_site);
+ @results = values %{ $r->{Site} } if ( exists $r->{Site} );
+
</%perl>
<div class="container">
<div class="containerhead">
- Search for <em><% $search %></em> returned: <% scalar(@results) %>
matches
+ Search for <em><% $search_site %></em> returned: <% scalar(@results) %>
matches
</div>
<div class="containerbody">
-% unless ( $search){
+% unless ( $search_site ){
% @results = Site->retrieve_all();
% }
<& /generic/sortresults.mhtml, object =>\@results, withedit=>1&>
-----------------------------------------------------------------------
Summary of changes:
htdocs/cable_plant/site_tasks.html | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
hooks/post-receive
--
UNNAMED PROJECT
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 65, Issue 6
*******************************************
