diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/browse/addr_block.cgi | 3 | ||||
| -rw-r--r-- | httemplate/elements/select-agent.html | 26 | ||||
| -rw-r--r-- | httemplate/elements/tr-select-agent.html | 13 |
3 files changed, 18 insertions, 24 deletions
diff --git a/httemplate/browse/addr_block.cgi b/httemplate/browse/addr_block.cgi index 241bb937f..1bbcdcbc1 100644 --- a/httemplate/browse/addr_block.cgi +++ b/httemplate/browse/addr_block.cgi @@ -92,8 +92,7 @@ my $html_foot = qq( <INPUT TYPE="text" NAME="ip_gateway" SIZE="15">/<INPUT TYPE="text" NAME="ip_netmask" SIZE="2"> ); $html_foot .= include( '/elements/select-agent.html', - 'agent_virt' => 1, - 'agent_null_right' => 'Broadband global configuration', + 'agent_null_right' => 'Broadband global configuration', ); $html_foot .= qq( <INPUT TYPE="submit" NAME="submit" VALUE="Add"> diff --git a/httemplate/elements/select-agent.html b/httemplate/elements/select-agent.html index d8ab50080..897c98248 100644 --- a/httemplate/elements/select-agent.html +++ b/httemplate/elements/select-agent.html @@ -1,10 +1,11 @@ <% include( '/elements/select-table.html', - 'table' => 'agent', - 'name_col' => 'agent', - 'value' => $agentnum || '', - 'empty_label' => 'all', - 'hashref' => { 'disabled' => '' }, - 'order_by' => ' ORDER BY agent', + 'table' => 'agent', + 'name_col' => 'agent', + 'value' => $agentnum || '', + 'agent_virt' => 1, + 'empty_label' => 'all', + 'hashref' => { 'disabled' => '' }, + 'order_by' => ' ORDER BY agent', 'disable_empty' => $disable_empty, %opt, ) @@ -18,12 +19,13 @@ $opt{'records'} = delete $opt{'agents'} if $opt{'agents'}; my $curuser = $FS::CurrentUser::CurrentUser; -my $disable_empty = 1; -if ( $opt{'agent_null_right'} && - $curuser->access_right($opt{'agent_null_right'}) - ) -{ - $disable_empty--; +my $disable_empty = 0; +if ( $opt{'agent_null_right'} ) { + if ( $curuser->access_right($opt{'agent_null_right'}) ) { + $disable_empty = 0; + } else { + $disable_empty = 1; + } } </%init> diff --git a/httemplate/elements/tr-select-agent.html b/httemplate/elements/tr-select-agent.html index 44df3fc7d..fcfa9f300 100644 --- a/httemplate/elements/tr-select-agent.html +++ b/httemplate/elements/tr-select-agent.html @@ -26,15 +26,8 @@ my %opt = @_; my $agentnum = $opt{'curr_value'} || $opt{'value'}; -my @agents; -if ( $opt{'agents'} ) { - #@agents = @{ $opt{'agents'} }; - #here is the agent virtualization - my $agentnums_href = $FS::CurrentUser::CurrentUser->agentnums_href; - @agents = grep $agentnums_href->{$_->agentnum}, @{ $opt{'agents'} }; - delete $opt{'agents'}; -} else { - @agents = $FS::CurrentUser::CurrentUser->agents; -} +my @agents = $opt{'agents'} + ? @{ $opt{'agents'} } + : $FS::CurrentUser::CurrentUser->agents; </%init> |