X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FAdmin%2FCustomFields%2Findex.html;h=cd9884f15171bfbccc3a05261a25c5d061e58159;hb=1c538bfabc2cd31f27067505f0c3d1a46cba6ef0;hp=e8687ed21a6214992085d3102622f118ce3f2719;hpb=73a6a80a9ca5edbd43d139b7cb25bfee4abfd35e;p=freeside.git
diff --git a/rt/share/html/Admin/CustomFields/index.html b/rt/share/html/Admin/CustomFields/index.html
index e8687ed21..cd9884f15 100644
--- a/rt/share/html/Admin/CustomFields/index.html
+++ b/rt/share/html/Admin/CustomFields/index.html
@@ -49,24 +49,7 @@
<& /Elements/Tabs &>
% my $tmp = RT::CustomField->new( $session{'CurrentUser'} );
-% if ( $Type ) {
-
<% loc("Custom Fields for [_1]", $tmp->FriendlyLookupType( $Type )) %>
-% }
-
-<& /Elements/CollectionList,
- OrderBy => 'LookupType|Name',
- Order => 'ASC|ASC',
- Rows => 50,
- %ARGS,
- Collection => $CustomFields,
- Format => $Format,
- DisplayFormat => ($Type? '' : '__FriendlyLookupType__,'). $Format,
- AllowSorting => 1,
- PassArguments => [
- qw(Format Rows Page Order OrderBy),
- qw(Type ShowDisabled)
- ],
-&>
+<% $Type ? loc("Custom Fields for [_1]", $Type) : loc('All Custom Fields') %>
+<& /Elements/CollectionList,
+ OrderBy => 'LookupType|Name',
+ Order => 'ASC|ASC',
+ Rows => $Rows,
+ %ARGS,
+ Collection => $CustomFields,
+ Format => $Format,
+ DisplayFormat => ($Type? '' : '__FriendlyLookupType__,'). $Format,
+ AllowSorting => 1,
+ PassArguments => [
+ qw(Format Rows Page Order OrderBy),
+ qw(Type ShowDisabled)
+ ],
+&>
+
<%args>
$Type => ''
$ShowDisabled => 0
@@ -95,12 +93,6 @@ $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;
@@ -109,5 +101,6 @@ $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>