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] Netdot branch netdot-1.0 updated.
netdot-1.0.6-67-gbb6e660 ([email protected])
2. [SCM] Netdot branch master updated. netdot-1.0.6-67-gbb6e660
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 31 Oct 2014 06:44:40 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.6-67-gbb6e660
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 "Netdot".
The branch, netdot-1.0 has been updated
via bb6e660c11226373e753f33d85f3c83db90842f0 (commit)
via b820ede85377fb9ee928cb9f9177150fb8101416 (commit)
from 4391670a6da2d10f78caec53c9fd7b9bf81757bd (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 bb6e660c11226373e753f33d85f3c83db90842f0
Author: Carlos Vicente <[email protected]>
Date: Fri Oct 31 09:44:30 2014 -0400
Work around bug where IP address shows as decimal for some reason
diff --git a/lib/Netdot/Model/Ipblock.pm b/lib/Netdot/Model/Ipblock.pm
index c38b67e..6f97236 100644
--- a/lib/Netdot/Model/Ipblock.pm
+++ b/lib/Netdot/Model/Ipblock.pm
@@ -1523,8 +1523,20 @@ sub full_address {
sub get_label {
my $self = shift;
- return $self->address if $self->is_address;
- return $self->cidr;
+ my $label;
+ if ( $self->is_address ){
+ $label = $self->address;
+ }else{
+ $label = $self->cidr;
+ }
+ if ( $label !~ /\D/o ){
+ # CDBI select trigger should make the address
+ # method return the dotted quad, but for some
+ # reason it doesn't in some cases.
+ # #annoying
+ $label = $self->int2ip($label, $self->version);
+ }
+ return $label;
}
##################################################################
commit b820ede85377fb9ee928cb9f9177150fb8101416
Author: Carlos Vicente <[email protected]>
Date: Fri Oct 31 09:11:20 2014 -0400
Disable editing buttons for Audit records
diff --git a/htdocs/generic/sortresults.mhtml b/htdocs/generic/sortresults.mhtml
index f9d8763..d582d94 100644
--- a/htdocs/generic/sortresults.mhtml
+++ b/htdocs/generic/sortresults.mhtml
@@ -50,6 +50,10 @@ my $numcols;
my $caller_path;
my $user = $ui->get_current_user($r);
+if ( $table eq 'Audit' ){
+ $withedit = 0;
+}
+
my $user_per_page = $user->getAttribute("USER_PERPAGE");
if ( !defined($per_page) ){
$per_page = $ui->config->get('DEFAULT_PERPAGE');
diff --git a/htdocs/generic/view.html b/htdocs/generic/view.html
index ea14399..fca66fb 100644
--- a/htdocs/generic/view.html
+++ b/htdocs/generic/view.html
@@ -26,6 +26,9 @@ my $DEBUG = 0;
my($obj, $prevobj );
my %ftables;
+my %no_edit_tables = (
+ 'Audit' => 1,
+ );
unless ( $obj = $table->retrieve($id) ){
$m->comp('error.mhtml', error => "Nonexistent record: $id");
@@ -53,6 +56,7 @@ if ( $DEBUG ){
<div class="container">
<div class="containerheadleft"><strong><% $table %></strong></div>
<div class="containerheadright">
+% unless ( exists $no_edit_tables{$table} ){
% if ( $manager && $manager->can($user, 'access_admin_section',
'view.html:new') ){
<a href="edit.html?table=<% $table %>">[new]</a>
% }
@@ -62,6 +66,7 @@ if ( $DEBUG ){
% if ( $manager && $manager->can($user, "delete", $obj) ){
<a href="delete.html?table=<% $table %>&id=<% $obj %>">[delete]</a>
% }
+% }
<a href="#"
onClick="opentextwindow(jspopoutstring,'js','');">[text]</a>
</div>
<div class="containerbodyoutside">
-----------------------------------------------------------------------
Summary of changes:
htdocs/generic/sortresults.mhtml | 4 ++++
htdocs/generic/view.html | 5 +++++
lib/Netdot/Model/Ipblock.pm | 16 ++++++++++++++--
3 files changed, 23 insertions(+), 2 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 2
Date: Fri, 31 Oct 2014 06:45:09 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch master updated.
netdot-1.0.6-67-gbb6e660
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 "Netdot".
The branch, master has been updated
via bb6e660c11226373e753f33d85f3c83db90842f0 (commit)
via b820ede85377fb9ee928cb9f9177150fb8101416 (commit)
via 4391670a6da2d10f78caec53c9fd7b9bf81757bd (commit)
from 4f223830ce13040276f89d70b5990f292bb9c74d (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
htdocs/generic/sortresults.mhtml | 4 ++++
htdocs/generic/view.html | 5 +++++
lib/Netdot/Model/Device.pm | 2 +-
lib/Netdot/Model/Ipblock.pm | 16 ++++++++++++++--
4 files changed, 24 insertions(+), 3 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 91, Issue 4
*******************************************
