X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FAdmin%2FCustomFields%2FObjects.html;h=0cad7d4d16d463174cbca4d4f90c8739a9d8f1eb;hp=8fb00a8125835368f268c0e30c0b1662b55ff898;hb=187086c479a09629b7d180eec513fb7657f4e291;hpb=fc6209f398899f0211cfcedeb81a3cd65e04a941

diff --git a/rt/share/html/Admin/CustomFields/Objects.html b/rt/share/html/Admin/CustomFields/Objects.html
index 8fb00a812..0cad7d4d1 100644
--- a/rt/share/html/Admin/CustomFields/Objects.html
+++ b/rt/share/html/Admin/CustomFields/Objects.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2018 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -46,33 +46,30 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/CustomFieldTabs,
-    id => $id,
-    current_tab => "Admin/CustomFields/Objects.html?id=".$id,
-    Title => $title
-    &>
+<& /Elements/Tabs &>
 
 <& /Elements/ListActions, actions => \@results &>
 
 <form action="Objects.html" method="post">
 <input type="hidden" class="hidden" name="id" value="<% $id %>" />
 
-% if ( $is_global ) {
+% if ( $CF->IsGlobal ) {
 <h2><&|/l&>Applies to all objects</&></h2>
-<input type="checkbox" name="RemoveCustomField-<% $CF->id %>" value="0" />
-<&|/l&>check this box to remove this Custom Field from all objects and be able to choose specific objects.</&>
+<input type="checkbox" id="RemoveCustomField-<% $CF->id %>" name="RemoveCustomField-<% $CF->id %>" value="0" />
+<label for="RemoveCustomField-<% $CF->id %>"><&|/l&>check this box to remove this Custom Field from all objects and be able to choose specific objects.</&></label>
 % } else {
 <h2><&|/l&>Apply globally</&></h2>
 
-<input type="checkbox" name="AddCustomField-<% $CF->id %>" value="0" />
-<&|/l&>check this box to apply this Custom Field to all objects.</&>
+<input type="checkbox" id="AddCustomField-<% $CF->id %>" name="AddCustomField-<% $CF->id %>" value="0" />
+<label for="AddCustomField-<% $CF->id %>"><&|/l&>check this box to apply this Custom Field to all objects.</&></label>
 
+% unless ( $CF->IsOnlyGlobal ) {
 <h2><&|/l&>Selected objects</&></h2>
 <& /Elements/CollectionList,
     OrderBy => 'id',
     Order => 'ASC',
     %ARGS,
-    Collection => $applied,
+    Collection => $added,
     Rows => 0,
     Page => 1,
     Format        => $format,
@@ -89,8 +86,8 @@
     OrderBy => 'id',
     Order => 'ASC',
     %ARGS,
-    Collection => $not_applied,
-    Rows => 50,
+    Collection => $not_added,
+    Rows          => $rows,
     Format        => $format,
     DisplayFormat => "'__CheckBox.{AddCustomField-". $CF->id ."}__',". $format,
     AllowSorting  => 1,
@@ -102,12 +99,14 @@
 
 % }
 
+% }
+
 <& /Elements/Submit, Name => 'UpdateObjs' &>
 </form>
 
 <%INIT>
 my $CF = RT::CustomField->new($session{'CurrentUser'});
-$CF->Load($id) or Abort(loc("Could not load CustomField [_1]"), $id);
+$CF->Load($id) or Abort(loc("Could not load CustomField [_1]", $id));
 
 my $class = $CF->RecordClassFromLookupType;
 Abort(loc("Something wrong. Contact system administrator"))
@@ -142,16 +141,15 @@ if ( $UpdateObjs ) {
     }
 }
 
-my $is_global = $CF->IsApplied(0);
-
-my $applied = $CF->AppliedTo;
-my $not_applied = $CF->NotAppliedTo;
+my $added = $CF->AddedTo;
+my $not_added = $CF->NotAddedTo;
 
-my $collection_class = ref($applied);
+my $collection_class = ref($added);
 $collection_class =~ s/^RT:://;
 
 my $format = RT->Config->Get('AdminSearchResultFormat')->{$collection_class}
     || '__id__,__Name__';
+my $rows = RT->Config->Get('AdminSearchResultRows')->{$collection_class} || 50;
 
 my $title = loc('Modify associated objects for [_1]', $CF->Name);