Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / rt / share / html / Admin / CustomFields / index.html

diff --git a/rt/share/html/Admin/CustomFields/index.html b/rt/share/html/Admin/CustomFields/index.html
index 2835b12..cd9884f 100644 (file)
--- a/rt/share/html/Admin/CustomFields/index.html
+++ b/rt/share/html/Admin/CustomFields/index.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -46,20 +46,33 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/CustomFieldTabs,
-    current_tab => 'Admin/CustomFields/', 
-    Title => $title,
-&>
+<& /Elements/Tabs &>
 
 % my $tmp = RT::CustomField->new( $session{'CurrentUser'} );
-% if ( $Type ) {
-<h2><% loc("Custom Fields for [_1]", $tmp->FriendlyLookupType( $Type )) %></h2>
+<h1><% $Type ? loc("Custom Fields for [_1]", $Type) : loc('All Custom Fields') %></h1>
+
+<form action="<%RT->Config->Get('WebPath')%>/Admin/CustomFields/index.html" method="get">
+<&|/l&>Only show custom fields for:</&>
+<select name="Type">
+<option value="" <% !$Type && 'selected="selected"'%> ><% loc('(any)') %></option>
+% for my $type ( $tmp->LookupTypes ) {
+<option value="<% $type %>" <% $type eq $Type && 'selected="selected"'%> ><% $tmp->FriendlyLookupType( $type ) %></option>
 % }
+</select>
+<br />
+<input type="checkbox" class="checkbox" id="ShowDisabled" name="ShowDisabled" value="1" <% $ShowDisabled && 'checked="checked"' |n %> />
+<label for="ShowDisabled"><&|/l&>Include disabled custom fields in listing.</&></label>
+<br />
+
+% $m->callback(CallbackName => 'BeforeSubmit');
+
+<div align="right"><input type="submit" value="<% loc('Go!') %>" /></div>
+</form>
 
 <& /Elements/CollectionList,
     OrderBy       => 'LookupType|Name',
     Order         => 'ASC|ASC',
-    Rows          => 50,
+    Rows          => $Rows,
     %ARGS,
     Collection    => $CustomFields,
     Format        => $Format,
@@ -71,22 +84,6 @@
     ],
 &>
 
-<form action="<%RT->Config->Get('WebPath')%>/Admin/CustomFields/index.html" method="get">
-<&|/l&>Only show custom fields for:</&>
-<select name="Type">
-<option value="" <% !$Type && 'selected="selected"'%> ><% loc('(any)') %></option>
-% for my $type ( $tmp->LookupTypes ) {
-<option value="<% $type %>" <% $type eq $Type && 'selected="selected"'%> ><% $tmp->FriendlyLookupType( $type ) %></option>
-% }
-</select>
-<br />
-<input type="checkbox" class="checkbox" name="ShowDisabled" value="1" <% $ShowDisabled && 'checked="checked"' |n%> />
-<&|/l&>Include disabled custom fields in listing.</&>
-<br />
-
-<input type="submit" value="<% loc('Go!') %>" />
-</form>
-
 <%args>
 $Type => ''
 $ShowDisabled => 0
@@ -96,17 +93,14 @@ $Format => undef
 <%INIT>
 my $title = loc('Select a Custom Field');
 
-$Type ||= $ARGS{'type'} || '';
-if ( !$Type && $ARGS{'type'} ) {
-    $Type ||= $ARGS{'type'};
-    $RT::Logger->warning("'type' argument is deprecated use 'Type' instead");
-}
-
 my $CustomFields = RT::CustomFields->new($session{'CurrentUser'});
 $CustomFields->UnLimit;
 $CustomFields->FindAllRows if $ShowDisabled;
 $CustomFields->LimitToLookupType( $Type ) if $Type;
 
+$m->callback(CallbackName => 'MassageCustomFields', CustomFields => $CustomFields);
+
 $Format ||= RT->Config->Get('AdminSearchResultFormat')->{'CustomFields'};
+my $Rows = RT->Config->Get('AdminSearchResultRows')->{'CustomFields'} || 50;
 
 </%INIT>