[freeside-commits] branch master updated. cb9ce7d5f8feb08de1c95a66f2761a06724c0a8e
Ivan
ivan at 420.am
Mon Jun 22 23:40:26 PDT 2015
The branch, master has been updated
via cb9ce7d5f8feb08de1c95a66f2761a06724c0a8e (commit)
from 9bd28ce9e715ea971b8001a8320c7d1033347888 (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 cb9ce7d5f8feb08de1c95a66f2761a06724c0a8e
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jun 22 23:40:25 2015 -0700
remove non-working sort link on address block browse, RT#36846
diff --git a/httemplate/browse/addr_block.cgi b/httemplate/browse/addr_block.cgi
index 46b12e6..ba40bfd 100644
--- a/httemplate/browse/addr_block.cgi
+++ b/httemplate/browse/addr_block.cgi
@@ -1,71 +1,71 @@
-<% include('elements/browse.html',
- 'title' => 'Address Blocks',
- 'name' => 'address block',
- 'html_init' => $html_init,
- 'html_foot' => $html_foot,
- 'query' => { 'table' => 'addr_block',
- 'hashref' => {},
- 'extra_sql' => $extra_sql,
- 'order_by' => $order_by,
- },
- 'count_query' => "SELECT count(*) from addr_block $count_sql",
- 'header' => [ 'Address Block',
- 'Router',
- 'Action(s)',
- '',
- '',
- '',
- ],
- 'fields' => [ 'NetAddr',
- sub { my $block = shift;
- my $router = $block->router;
- my $result = '';
- if ($router) {
- $result .= $router->routername. ' (';
- $result .= scalar($block->svc_broadband). ' services)';
- }
- $result;
- },
- $allocate_text,
- sub { shift->router ? '' : '<FONT SIZE="-2">(split)</FONT>' },
- sub { '<FONT SIZE="-2">('. (shift->manual_flag ? 'allow' : 'prevent'). ' automatic ip assignment)</FONT>' },
- sub {
- my $block = shift;
- if(!$block->router && scalar($block->svc_broadband) == 0) {
- return '<FONT SIZE="-2">(delete)</FONT>';
- }
- '';
- },
- ],
- 'links' => [ '',
- '',
- [ 'javascript:void(0)', '' ],
- $split_link,
- $autoassign_link,
- sub {
- my $block = shift;
- if(!$block->router && scalar($block->svc_broadband) == 0) {
- [ "${p}misc/delete-addr_block.html?", 'blocknum' ];
- }
- },
- ],
- 'link_onclicks' => [ '',
- '',
- $allocate_link,
- '',
- '',
- ],
- 'cell_styles' => [ '',
- '',
- 'border-right:none;',
- 'border-left:none;',
- '',
- ],
- 'agent_virt' => 1,
- 'agent_null_right' => 'Broadband global configuration',
- 'agent_pos' => 1,
- )
-%>
+<& elements/browse.html,
+ 'title' => 'Address Blocks',
+ 'name' => 'address block',
+ 'html_init' => $html_init,
+ 'html_foot' => $html_foot,
+ 'query' => { 'table' => 'addr_block',
+ 'hashref' => {},
+ 'extra_sql' => $extra_sql,
+ 'order_by' => $order_by,
+ },
+ 'count_query' => "SELECT count(*) from addr_block $count_sql",
+ 'header' => [ 'Address Block',
+ 'Router',
+ 'Action(s)',
+ '',
+ '',
+ '',
+ ],
+ 'fields' => [ 'NetAddr',
+ sub { my $block = shift;
+ my $router = $block->router;
+ my $result = '';
+ if ($router) {
+ $result .= $router->routername. ' (';
+ $result .= scalar($block->svc_broadband). ' services)';
+ }
+ $result;
+ },
+ $allocate_text,
+ sub { shift->router ? '' : '<FONT SIZE="-2">(split)</FONT>' },
+ sub { '<FONT SIZE="-2">('. (shift->manual_flag ? 'allow' : 'prevent'). ' automatic ip assignment)</FONT>' },
+ sub {
+ my $block = shift;
+ if(!$block->router && scalar($block->svc_broadband) == 0) {
+ return '<FONT SIZE="-2">(delete)</FONT>';
+ }
+ '';
+ },
+ ],
+ 'sort_fields' => [],
+ 'links' => [ '',
+ '',
+ [ 'javascript:void(0)', '' ],
+ $split_link,
+ $autoassign_link,
+ sub {
+ my $block = shift;
+ if(!$block->router && scalar($block->svc_broadband) == 0) {
+ [ "${p}misc/delete-addr_block.html?", 'blocknum' ];
+ }
+ },
+ ],
+ 'link_onclicks' => [ '',
+ '',
+ $allocate_link,
+ '',
+ '',
+ ],
+ 'cell_styles' => [ '',
+ '',
+ 'border-right:none;',
+ 'border-left:none;',
+ '',
+ ],
+ 'agent_virt' => 1,
+ 'agent_null_right' => 'Broadband global configuration',
+ 'agent_pos' => 1,
+&>
<%init>
die "access denied"
-----------------------------------------------------------------------
Summary of changes:
httemplate/browse/addr_block.cgi | 136 +++++++++++++++++++-------------------
1 file changed, 68 insertions(+), 68 deletions(-)
More information about the freeside-commits
mailing list