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. [Netdot - Bug #1706] Upgrade 0.9.10 to 1.0.2
([email protected])
2. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-8-g5e39ef2 ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 20 Nov 2012 09:56:23 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1706] Upgrade 0.9.10 to 1.0.2
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1706 has been updated by Carlos Vicente.
Alen F wrote:
> hello,
>
> i cannot upgrade my database to 1.0.2. Following error occured.
>
> cd upgrade; make all DIR=upgrade
> make[1]: Entering directory `/home/netdot/netdot-1.0.2/upgrade'
>
> Upgrading schema and data...
> /usr/bin/perl updatedb 2>error.log
> DEBUG: init: dbi:mysql:dbname=netdot;host=localhost;mysql_local_infile=1
> make[1]: *** [db] Error 255
> make[1]: Leaving directory `/home/netdot/netdot-1.0.2/upgrade'
> make: *** [upgrade] Error 2
You should see some error messages in the error.log file.
BTW, it is not possible to upgrade from 0.9.10 to 1.0.2 directly. You must
first upgrade to 1.0.1.
>From 1.0.1 on, it will be possible to upgrade multiple versions at once.
----------------------------------------
Bug #1706: Upgrade 0.9.10 to 1.0.2
https://osl.uoregon.edu/redmine/issues/1706#change-3010
Author: Alen F
Status: New
Priority: Normal
Assignee:
Category:
Target version:
Resolution:
hello,
i cannot upgrade my database to 1.0.2. Following error occured.
cd upgrade; make all DIR=upgrade
make[1]: Entering directory `/home/netdot/netdot-1.0.2/upgrade'
Upgrading schema and data...
/usr/bin/perl updatedb 2>error.log
DEBUG: init: dbi:mysql:dbname=netdot;host=localhost;mysql_local_infile=1
make[1]: *** [db] Error 255
make[1]: Leaving directory `/home/netdot/netdot-1.0.2/upgrade'
make: *** [upgrade] Error 2
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 2
Date: Tue, 20 Nov 2012 11:30:07 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.2-8-g5e39ef2
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 5e39ef219ac2f11261456c07a778112a28d4ddfb (commit)
via 51f7ad02a54ad38afa917e52b6f91f1bfc97f300 (commit)
from b87a3f06603b315270a327f6566bbec3660ace8c (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 5e39ef219ac2f11261456c07a778112a28d4ddfb
Author: Carlos Vicente <[email protected]>
Date: Tue Nov 20 14:29:48 2012 -0500
Show MX records pointing to the RR being shown
diff --git a/htdocs/management/host.html b/htdocs/management/host.html
index 6da46b9..9fdd03f 100644
--- a/htdocs/management/host.html
+++ b/htdocs/management/host.html
@@ -329,7 +329,8 @@ foreach my $o ( values %rrs ) {
#RRADDR
if ( $o->name eq '@' || $o->name eq $o->zone->name || (!$o->cnames &&
!$o->ptr_records) ){
print '<div class="container" style="margin-left:10px">';
- print '<div class="containerheadleft"><b>Address
'.$ui->table_descr_link('RRADDR', '(A/AAAA)').'</b></div>';
+ print '<div class="containerheadleft"><b>Address
'.$ui->table_descr_link('RRADDR', '(A/AAAA)').
+ '</b></div>';
print '<div class="containerheadright">';
if ( $manager && $manager->can($user, "access_section",
'host.html:add_rraddr') ){
@@ -341,11 +342,13 @@ foreach my $o ( values %rrs ) {
$newrraddr =~ s/\n//g;
$newrraddr =~ s/<script.*?<\/script>//g;
$newrraddr =~ s/'/\\'/g;
- print '<script type="text/javascript"
language="javascript">uricomponents[\'rraddr_'.$o.'_content\']=encodeURIComponent(\''.$newrraddr.'\');</script>';
+ print '<script type="text/javascript"
language="javascript">uricomponents[\'rraddr_'.$o.
+ '_content\']=encodeURIComponent(\''.$newrraddr.'\');</script>';
print ' ';
if ( !$edit ){
if ( $manager && $manager->can($user, 'edit', $o) ){
- print '<div id="rraddr_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rraddr\', \''.$o.'\', 1, \'rr\')">[add]</a></div>';
+ print '<div id="rraddr_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rraddr\', \''.$o.
+ '\', 1, \'rr\')">[add]</a></div>';
}
}
}else{
@@ -390,7 +393,8 @@ foreach my $o ( values %rrs ) {
if ( int($ipblock->parent) != 0 && $ipblock->parent->dhcp_scopes ) {
# Subnet is in DHCP
$gscope = $ipblock->parent->dhcp_scopes->first->get_global;
- $m->comp('/generic/error.mhtml', error=>"Could not determine
global scope for IP ".$ipblock->get_label)
+ $m->comp('/generic/error.mhtml', error=>"Could not determine
global scope for IP ".
+ $ipblock->get_label)
unless $gscope;
}else{
@@ -434,7 +438,8 @@ foreach my $o ( values %rrs ) {
}elsif ( $ipblock->version == 6 ){
push @field_headers, ('DUID: ');
if ( $edit ){
- push @cell_data, '<input type="text" size="48"
name="DhcpScope__'.$scope.'__duid" value="'.$scope->duid.'" >';
+ push @cell_data, '<input type="text" size="48"
name="DhcpScope__'.$scope.
+ '__duid" value="'.$scope->duid.'" >';
}else{
push( @cell_data, $scope->duid );
}
@@ -456,7 +461,8 @@ foreach my $o ( values %rrs ) {
print '<input name="DhcpScope__NEW__name"
value="'.$ipblock->address.'" type="hidden">';
print '<input name="DhcpScope__NEW__ipblock"
value="'.$ipblock.'" type="hidden">';
if ( $ipblock->version == 4 ||
- ($ipblock->version == 6 &&
Netdot->config->get('DHCPD_ALLOW_ETHERNET_FOR_IPV6_HOST_DECL')) ){
+ ($ipblock->version == 6 &&
+
Netdot->config->get('DHCPD_ALLOW_ETHERNET_FOR_IPV6_HOST_DECL')) ){
push @field_headers, ('Ethernet: ');
push( @cell_data, '<input
name="DhcpScope__NEW__physaddr" value="" type="text">' );
}elsif ( $ipblock->version == 6 ){
@@ -473,7 +479,8 @@ foreach my $o ( values %rrs ) {
#####################################################################################################
#RRHINFO
print '<div class="container" style="margin-left:10px">';
- print '<div class="containerheadleft"><b>Hardware Information
'.$ui->table_descr_link('RRHINFO', '(HINFO)').'</b></div>';
+ print '<div class="containerheadleft"><b>Hardware Information '.
+ $ui->table_descr_link('RRHINFO', '(HINFO)').'</b></div>';
print '<div class="containerheadright">';
my $cpu_defaults = $ui->config->get('DEFAULT_HINFO_CPU_VALUES');
@@ -493,11 +500,13 @@ foreach my $o ( values %rrs ) {
$newhinfo =~ s/\n//g;
$newhinfo =~ s/<script.*?<\/script>//g;
$newhinfo =~ s/'/\\'/g;
- print '<script type="text/javascript"
language="javascript">uricomponents[\'rrhinfo_'.$o.'_content\']=encodeURIComponent(\''.$newhinfo.'\');</script>';
+ print '<script type="text/javascript"
language="javascript">uricomponents[\'rrhinfo_'.
+
$o.'_content\']=encodeURIComponent(\''.$newhinfo.'\');</script>';
print ' ';
if ( !$edit ){
if ( $manager && $manager->can($user, 'edit', $o) ){
- print '<div id="rrhinfo_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrhinfo\', \''.$o.'\', 1, \'rr\')">[add]</a></div>';
+ print '<div id="rrhinfo_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrhinfo\', \''.
+ $o.'\', 1, \'rr\')">[add]</a></div>';
}
}
}else{
@@ -525,7 +534,8 @@ foreach my $o ( values %rrs ) {
#####################################################################################################
#RRTXT
print '<div class="container" style="margin-left:10px">';
- print '<div class="containerheadleft"><b>Text Records
'.$ui->table_descr_link('RRTXT', '(TXT)').'</b></div>';
+ print '<div class="containerheadleft"><b>Text Records
'.$ui->table_descr_link('RRTXT', '(TXT)').
+ '</b></div>';
print '<div class="containerheadright">';
#new rrtxt
@@ -537,11 +547,13 @@ foreach my $o ( values %rrs ) {
$newtxt =~ s/\n//g;
$newtxt =~ s/<script.*?<\/script>//g;
$newtxt =~ s/'/\\'/g;
- print '<script type="text/javascript"
language="javascript">uricomponents[\'rrtxt_'.$o.'_content\']=encodeURIComponent(\''.$newtxt.'\');</script>';
+ print '<script type="text/javascript"
language="javascript">uricomponents[\'rrtxt_'.$o.
+ '_content\']=encodeURIComponent(\''.$newtxt.'\');</script>';
print ' ';
if ( !$edit ){
if ( $manager && $manager->can($user, 'edit', $o) ){
- print '<div id="rrtxt_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrtxt\', \''.$o.'\', 1, \'rr\')">[add]</a></div>';
+ print '<div id="rrtxt_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrtxt\', \''.$o.
+ '\', 1, \'rr\')">[add]</a></div>';
}
}
print '</div>'; #close containerheadright
@@ -564,7 +576,8 @@ foreach my $o ( values %rrs ) {
#####################################################################################################
#RRMX
print '<div class="container" style="margin-left:10px">';
- print '<div class="containerheadleft"><b>Mail Exchangers
'.$ui->table_descr_link('RRMX', '(MX)').'</b></div>';
+ print '<div class="containerheadleft"><b>Mail Exchangers
'.$ui->table_descr_link('RRMX', '(MX)').
+ '</b></div>';
print '<div class="containerheadright">';
#new rrmx
@@ -576,11 +589,13 @@ foreach my $o ( values %rrs ) {
$newmx =~ s/\n//g;
$newmx =~ s/<script.*?<\/script>//g;
$newmx =~ s/'/\\'/g;
- print '<script type="text/javascript"
language="javascript">uricomponents[\'rrmx_'.$o.'_content\']=encodeURIComponent(\''.$newmx.'\');</script>';
+ print '<script type="text/javascript"
language="javascript">uricomponents[\'rrmx_'.$o.
+ '_content\']=encodeURIComponent(\''.$newmx.'\');</script>';
print ' ';
if ( !$edit ){
if ( $manager && $manager->can($user, 'edit', $o) ){
- print '<div id="rrmx_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrmx\', \''.$o.'\', 1, \'rr\')">[add]</a></div>';
+ print '<div id="rrmx_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrmx\', \''.$o.
+ '\', 1, \'rr\')">[add]</a></div>';
}
}
print '</div>'; #close containerheadright
@@ -602,9 +617,28 @@ foreach my $o ( values %rrs ) {
#####################################################################################################
+ #RRMX pointing to $o
+ if ( my @mxs = RRMX->search(exchange=>$o->get_label) ){
+ print '<div class="container" style="margin-left:10px">';
+ print '<div class="containerhead"><b>MX records pointing to
'.$o->get_label.'</b></div>';
+
+ # display only
+ print '<div class="containerbody">';
+ foreach my $mx ( sort { $a->rr->name cmp $b->rr->name } @mxs ) {
+ $ui->add_to_fields(o=>$mx, edit=>0, fields=>['rr'],
+ field_headers=>\@field_headers,
cell_data=>\@cell_data,
+ linkpages=>['host.html']);
+ $m->comp('/generic/attribute_table.mhtml', %comphash, width=>1);
+ (@field_headers, @cell_data) = ((),());
+ }
+ print '</div></div>';
+ }
+
+
#####################################################################################################
#RRCNAME for somewhere pointing to $o
print '<div class="container" style="margin-left:10px">';
- print '<div class="containerheadleft"><b>Aliases of '.$o->get_label.'
'.$ui->table_descr_link('RRCNAME', '(CNAME)').'</b></div>';
+ print '<div class="containerheadleft"><b>Aliases of '.$o->get_label.' '.
+ $ui->table_descr_link('RRCNAME', '(CNAME)').'</b></div>';
print '<div class="containerheadright">';
if ( $add_alias ){
print '<input type="button" name="cancel_button" value="cancel"
onClick="history.go(-1);">';
@@ -656,7 +690,8 @@ foreach my $o ( values %rrs ) {
if ( !$o->a_records && !$o->ptr_records && !$o->ns_records ) {
print '<div class="container" style="margin-left:10px">';
- print '<div class="containerheadleft"><b>'.$o->get_label.' is an alias
of '.$ui->table_descr_link('RRCNAME', '(CNAME)').'</b></div>';
+ print '<div class="containerheadleft"><b>'.$o->get_label.' is an alias
of '.
+ $ui->table_descr_link('RRCNAME', '(CNAME)').'</b></div>';
print '<div class="containerheadright">';
my @cnames = $o->cnames();
@@ -670,11 +705,13 @@ foreach my $o ( values %rrs ) {
$newcname =~ s/\n//g;
$newcname =~ s/<script.*?<\/script>//g;
$newcname =~ s/'/\\'/g;
- print '<script type="text/javascript"
language="javascript">uricomponents[\'rrcname_'.$o.'_content\']=encodeURIComponent(\''.$newcname.'\');</script>';
+ print '<script type="text/javascript"
language="javascript">uricomponents[\'rrcname_'.
+
$o.'_content\']=encodeURIComponent(\''.$newcname.'\');</script>';
print ' ';
if ( !$edit ){
if ( $manager && $manager->can($user, 'edit', $o) ){
- print '<div id="rrcname_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrcname\', \''.$o.'\', 1, \'rr\')">[add]</a></div>';
+ print '<div id="rrcname_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrcname\', \''.
+ $o.'\', 1, \'rr\')">[add]</a></div>';
}
}
@@ -741,7 +778,8 @@ foreach my $o ( values %rrs ) {
my $ptr = $ipblock->ptr_records->first;
print '<div class="container" style="margin-left:10px">';
- print '<div class="containerheadleft"><b>Reverse for
'.$ipblock->get_label.' '.$ui->table_descr_link('RRPTR', '(PTR)').'</b></div>';
+ print '<div class="containerheadleft"><b>Reverse for
'.$ipblock->get_label.' '.
+ $ui->table_descr_link('RRPTR', '(PTR)').'</b></div>';
print '<div class="containerheadright">';
print ' ';
if ( !$ptr ){
@@ -819,12 +857,14 @@ foreach my $o ( values %rrs ) {
$newns =~ s/\n//g;
$newns =~ s/<script.*?<\/script>//g;
$newns =~ s/'/\\'/g;
- print '<script type="text/javascript"
language="javascript">uricomponents[\'rrns_'.$o.'_content\']=encodeURIComponent(\''.$newns.'\');</script>';
+ print '<script type="text/javascript"
language="javascript">uricomponents[\'rrns_'.$o.
+ '_content\']=encodeURIComponent(\''.$newns.'\');</script>';
print ' ';
if ( !$edit ){
if ( $manager && $manager->can($user, 'access_section',
'add_ns_records')
&& $manager->can($user, 'edit', $o) ){
- print '<div id="rrns_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrns\', \''.$o.'\', 1, \'rr\')">[add]</a></div>';
+ print '<div id="rrns_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrns\', \''.$o.
+ '\', 1, \'rr\')">[add]</a></div>';
}
}
print '</div>'; #close containerheadright
@@ -855,7 +895,8 @@ foreach my $o ( values %rrs ) {
#RRDS
if ( !$o->a_records && !$o->ptr_records ){
print '<div class="container" style="margin-left:10px">';
- print '<div class="containerheadleft"><b>Delegation Signers
'.$ui->table_descr_link('RRDS', '(DS)').'</b></div>';
+ print '<div class="containerheadleft"><b>Delegation Signers '.
+ $ui->table_descr_link('RRDS', '(DS)').'</b></div>';
print '<div class="containerheadright">';
my @field_names = ('key_tag', 'algorithm', 'digest_type', 'digest',
'ttl');
@@ -868,12 +909,14 @@ foreach my $o ( values %rrs ) {
$newds =~ s/\n//g;
$newds =~ s/<script.*?<\/script>//g;
$newds =~ s/'/\\'/g;
- print '<script type="text/javascript"
language="javascript">uricomponents[\'rrds_'.$o.'_content\']=encodeURIComponent(\''.$newds.'\');</script>';
+ print '<script type="text/javascript"
language="javascript">uricomponents[\'rrds_'.
+ $o.'_content\']=encodeURIComponent(\''.$newds.'\');</script>';
print ' ';
if ( !$edit ){
if ( $manager && $manager->can($user, 'access_section',
'add_ds_records')
&& $manager->can($user, 'edit', $o) ){
- print '<div id="rrds_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrds\', \''.$o.'\', 1, \'rr\')">[add]</a></div>';
+ print '<div id="rrds_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrds\', \''.
+ $o.'\', 1, \'rr\')">[add]</a></div>';
}
}
print '</div>'; #close containerheadright
@@ -905,7 +948,8 @@ foreach my $o ( values %rrs ) {
if ( !$o->a_records && !$o->ptr_records && !$o->ns_records ){
print '<div class="container" style="margin-left:10px">';
- print '<div class="containerheadleft"><b>Name Authority Pointer
'.$ui->table_descr_link('RRNAPTR', '(NAPTR)').'</b></div>';
+ print '<div class="containerheadleft"><b>Name Authority Pointer '.
+ $ui->table_descr_link('RRNAPTR', '(NAPTR)').'</b></div>';
print '<div class="containerheadright">';
#new rrnaptr
@@ -919,11 +963,13 @@ foreach my $o ( values %rrs ) {
$newnaptr =~ s/\n//g;
$newnaptr =~ s/<script.*?<\/script>//g;
$newnaptr =~ s/'/\\'/g;
- print '<script type="text/javascript"
language="javascript">uricomponents[\'rrnaptr_'.$o.'_content\']=encodeURIComponent(\''.$newnaptr.'\');</script>';
+ print '<script type="text/javascript"
language="javascript">uricomponents[\'rrnaptr_'.
+ $o.'_content\']=encodeURIComponent(\''.$newnaptr.'\');</script>';
print ' ';
if ( !$edit ){
if ( $manager && $manager->can($user, 'edit', $o) ){
- print '<div id="rrnaptr_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrnaptr\', \''.$o.'\', 1, \'rr\')">[add]</a></div>';
+ print '<div id="rrnaptr_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrnaptr\', \''.
+ $o.'\', 1, \'rr\')">[add]</a></div>';
}
}
print '</div>'; #close containerheadright
@@ -951,7 +997,8 @@ foreach my $o ( values %rrs ) {
if ( !$o->a_records && !$o->ns_records ){
print '<div class="container" style="margin-left:10px">';
- print '<div class="containerheadleft"><b>Pointer Records
'.$ui->table_descr_link('RRPTR', '(PTR)').'</b></div>';
+ print '<div class="containerheadleft"><b>Pointer Records '.
+ $ui->table_descr_link('RRPTR', '(PTR)').'</b></div>';
print '<div class="containerheadright">';
#new rrptr
@@ -965,11 +1012,13 @@ foreach my $o ( values %rrs ) {
$newptr =~ s/\n//g;
$newptr =~ s/<script.*?<\/script>//g;
$newptr =~ s/'/\\'/g;
- print '<script type="text/javascript"
language="javascript">uricomponents[\'rrptr_'.$o.'_content\']=encodeURIComponent(\''.$newptr.'\');</script>';
+ print '<script type="text/javascript"
language="javascript">uricomponents[\'rrptr_'.$o.
+ '_content\']=encodeURIComponent(\''.$newptr.'\');</script>';
print ' ';
if ( !$edit ){
if ( $manager && $manager->can($user, 'edit', $o) ){
- print '<div id="rrptr_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrptr\', \''.$o.'\', 1, \'rr\')">[add]</a></div>';
+ print '<div id="rrptr_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrptr\', \''.$o.
+ '\', 1, \'rr\')">[add]</a></div>';
}
}
print '</div>'; #close containerheadright
@@ -980,9 +1029,11 @@ foreach my $o ( values %rrs ) {
foreach my $ptr (@ptrs) {
push( @field_headers, "IP:");
if ($edit) {
- push( @cell_data, "<input name='RRPTR__".$ptr."__ipblock'
value='".$ptr->ipblock->address."' type='text'>" );
+ push( @cell_data, "<input name='RRPTR__".$ptr."__ipblock'
value='".
+ $ptr->ipblock->address."' type='text'>" );
} else {
- push( @cell_data, "<a
href='ip.html?id=".$ptr->ipblock->id."'>".$ptr->ipblock->address."</a>");
+ push( @cell_data, "<a
href='ip.html?id=".$ptr->ipblock->id."'>".
+ $ptr->ipblock->address."</a>");
}
$ui->add_to_fields(o=>$ptr, edit=>$edit, fields=>['ptrdname',
'ttl'],
field_headers=>\@field_headers,
cell_data=>\@cell_data,
@@ -1001,7 +1052,8 @@ foreach my $o ( values %rrs ) {
#RRLOC
if ( !$o->ptr_records && !$o->ns_records ){
print '<div class="container" style="margin-left:10px">';
- print '<div class="containerheadleft"><b>Location Records
'.$ui->table_descr_link('RRLOC', '(LOC)').'</b></div>';
+ print '<div class="containerheadleft"><b>Location Records '.
+ $ui->table_descr_link('RRLOC', '(LOC)').'</b></div>';
print '<div class="containerheadright">';
#new
@@ -1009,18 +1061,21 @@ foreach my $o ( values %rrs ) {
fields=>['latitude', 'longitude', 'altitude',
'size',
'horiz_pre', 'vert_pre', 'ttl'],
field_headers=>\@field_headers,
cell_data=>\@cell_data,
- linkpages=>['view.html', 'view.html', 'view.html',
'view.html', 'view.html', 'view.html', ''],
+ linkpages=>['view.html', 'view.html', 'view.html',
'view.html', 'view.html',
+ 'view.html', ''],
);
my $newloc = $m->scomp('/generic/attribute_table.mhtml', %comphash);
(@field_headers, @cell_data) = ((),());
$newloc =~ s/\n//g;
$newloc =~ s/<script.*?<\/script>//g;
$newloc =~ s/'/\\'/g;
- print '<script type="text/javascript"
language="javascript">uricomponents[\'rrloc_'.$o.'_content\']=encodeURIComponent(\''.$newloc.'\');</script>';
+ print '<script type="text/javascript"
language="javascript">uricomponents[\'rrloc_'.$o.
+ '_content\']=encodeURIComponent(\''.$newloc.'\');</script>';
print ' ';
if ( !$edit ){
if ( $manager && $manager->can($user, 'edit', $o) ){
- print '<div id="rrloc_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrloc\', \''.$o.'\', 1, \'rr\')">[add]</a></div>';
+ print '<div id="rrloc_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrloc\', \''.$o.
+ '\', 1, \'rr\')">[add]</a></div>';
}
}
print '</div>'; #close containerheadright
@@ -1033,7 +1088,8 @@ foreach my $o ( values %rrs ) {
fields=>['latitude', 'longitude',
'altitude',
'size', 'horiz_pre', 'vert_pre',
'ttl'],
field_headers=>\@field_headers,
cell_data=>\@cell_data,
- linkpages=>['view.html', 'view.html',
'view.html', 'view.html', 'view.html', 'view.html', ''],
+ linkpages=>['view.html', 'view.html',
'view.html', 'view.html',
+ 'view.html', 'view.html', ''],
with_delete=>1
);
$m->comp('/generic/attribute_table.mhtml', %comphash);
@@ -1050,7 +1106,8 @@ foreach my $o ( values %rrs ) {
# Only show this part if owner name follows valid format
if ( $o->name =~ /^_.+\._.+/ ){
print '<div class="container" style="margin-left:10px">';
- print '<div class="containerheadleft"><b>Service Records
'.$ui->table_descr_link('RRSRV', '(SRV)').'</b></div>';
+ print '<div class="containerheadleft"><b>Service Records '.
+ $ui->table_descr_link('RRSRV', '(SRV)').'</b></div>';
print '<div class="containerheadright">';
#new rrsrv
@@ -1062,11 +1119,13 @@ foreach my $o ( values %rrs ) {
$newsrv =~ s/\n//g;
$newsrv =~ s/<script.*?<\/script>//g;
$newsrv =~ s/'/\\'/g;
- print '<script type="text/javascript"
language="javascript">uricomponents[\'rrsrv_'.$o.'_content\']=encodeURIComponent(\''.$newsrv.'\');</script>';
+ print '<script type="text/javascript"
language="javascript">uricomponents[\'rrsrv_'.$o.
+ '_content\']=encodeURIComponent(\''.$newsrv.'\');</script>';
print ' ';
if ( !$edit ){
if ( $manager && $manager->can($user, 'edit', $o) ){
- print '<div id="rrsrv_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrsrv\', \''.$o.'\', 1, \'rr\')">[add]</a></div>';
+ print '<div id="rrsrv_'.$o.'"><a href="#"
onClick="dynamicAdd(\'rrsrv\', \''.$o.
+ '\', 1, \'rr\')">[add]</a></div>';
}
}
print '</div>'; #close containerheadright
commit 51f7ad02a54ad38afa917e52b6f91f1bfc97f300
Author: Carlos Vicente <[email protected]>
Date: Tue Nov 20 14:29:28 2012 -0500
Remove MX records whose exchange RR is deleted
diff --git a/lib/Netdot/Model/RR.pm b/lib/Netdot/Model/RR.pm
index 6b30f70..82bdec5 100644
--- a/lib/Netdot/Model/RR.pm
+++ b/lib/Netdot/Model/RR.pm
@@ -350,7 +350,7 @@ sub update_ptr {
=head2 delete - Override delete method
- * Removes any matching CNAMEs
+ * Removes any matching CNAMEs and MX records
Arguments:
None
@@ -366,8 +366,9 @@ sub delete {
$self->isa_object_method('delete');
my $class = ref($self);
my @cnames = RRCNAME->search(cname=>$self->get_label);
- foreach my $cname ( @cnames ){
- $cname->rr->delete();
+ my @mxs = RRMX->search(exchange=>$self->get_label);
+ foreach my $o ( @cnames, @mxs ){
+ $o->rr->delete();
}
return $self->SUPER::delete();
}
-----------------------------------------------------------------------
Summary of changes:
htdocs/management/host.html | 141 ++++++++++++++++++++++++++++++-------------
lib/Netdot/Model/RR.pm | 7 +-
2 files changed, 104 insertions(+), 44 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 68, Issue 4
*******************************************
