diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:32:26 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:32:26 -0700 |
| commit | 026dc7ad72ba972f230b6709e31fa64397d75ad4 (patch) | |
| tree | c5af1a7ac9154744afc3660e9a9405892f2bb50b /rt/share/html/Admin/Elements/EditCustomFields | |
| parent | 07b4bc84d1078f7390221d766cdb3142513db4b0 (diff) | |
| parent | 1c538bfabc2cd31f27067505f0c3d1a46cba6ef0 (diff) | |
merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237
Diffstat (limited to 'rt/share/html/Admin/Elements/EditCustomFields')
| -rwxr-xr-x | rt/share/html/Admin/Elements/EditCustomFields | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/rt/share/html/Admin/Elements/EditCustomFields b/rt/share/html/Admin/Elements/EditCustomFields index 904a82c97..5ad1ec58d 100755 --- a/rt/share/html/Admin/Elements/EditCustomFields +++ b/rt/share/html/Admin/Elements/EditCustomFields @@ -55,7 +55,7 @@ <h2><&|/l&>Selected Custom Fields</&></h2> <& /Elements/CollectionList, %ARGS, - Collection => $applied_cfs, + Collection => $added_cfs, Rows => 0, Page => 1, Format => $format, @@ -73,8 +73,8 @@ OrderBy => 'Name', Order => 'ASC', %ARGS, - Collection => $not_applied_cfs, - Rows => 50, + Collection => $not_added_cfs, + Rows => $rows, Format => $format, DisplayFormat => "'__CheckBox.{AddCustomField}__',". $format, AllowSorting => 1, @@ -152,17 +152,18 @@ if ( $UpdateCFs ) { $m->callback(CallbackName => 'UpdateExtraFields', Results => \@results, Object => $Object, %ARGS); -my $applied_cfs = RT::CustomFields->new( $session{'CurrentUser'} ); -$applied_cfs->LimitToLookupType($lookup); -$applied_cfs->LimitToGlobalOrObjectId($id); -$applied_cfs->SetContextObject( $Object ); -$applied_cfs->ApplySortOrder; +my $added_cfs = RT::CustomFields->new( $session{'CurrentUser'} ); +$added_cfs->LimitToLookupType($lookup); +$added_cfs->LimitToGlobalOrObjectId($id); +$added_cfs->SetContextObject( $Object ); +$added_cfs->ApplySortOrder; -my $not_applied_cfs = RT::CustomFields->new( $session{'CurrentUser'} ); -$not_applied_cfs->LimitToLookupType($lookup); -$not_applied_cfs->LimitToNotApplied( $id ? ($id, 0) : (0) ); +my $not_added_cfs = RT::CustomFields->new( $session{'CurrentUser'} ); +$not_added_cfs->LimitToLookupType($lookup); +$not_added_cfs->LimitToNotAdded( $id ? ($id, 0) : (0) ); my $format = RT->Config->Get('AdminSearchResultFormat')->{'CustomFields'}; +my $rows = RT->Config->Get('AdminSearchResultRows')->{'CustomFields'} || 50; my $display_format = $id ? ("'__RemoveCheckBox.{$id}__',". $format .", '__MoveCF.{$id}__'") |