[Rt-commit] r17722 - in rt/3.8/trunk/share/html/Admin: Elements

[ruz at bestpractical.com]

Author: ruz
Date: Mon Jan 12 20:58:18 2009
New Revision: 17722

Modified:
   rt/3.8/trunk/share/html/Admin/CustomFields/Objects.html
   rt/3.8/trunk/share/html/Admin/Elements/CustomFieldTabs

Log:
* better support situations when CF's LookupType is not complex,
  for example 'RT::Queue'. Thanks to Philip Kime and Emmanuel Lacour


Modified: rt/3.8/trunk/share/html/Admin/CustomFields/Objects.html
==============================================================================
--- rt/3.8/trunk/share/html/Admin/CustomFields/Objects.html	(original)
+++ rt/3.8/trunk/share/html/Admin/CustomFields/Objects.html	Mon Jan 12 20:58:18 2009
@@ -70,7 +70,7 @@
 my $CF = RT::CustomField->new($session{'CurrentUser'});
 $CF->Load($id) or Abort(loc("Could not load CustomField [_1]"), $id);
 my $LookupType = $CF->LookupType || '';
-$LookupType =~ /^(.*?)-/ ||
+$LookupType =~ /^([^-]+)/ ||
      Abort(loc("Object of type [_1] cannot take custom fields", $LookupType));
 
 my $Class = $1;
@@ -92,6 +92,12 @@
 my $title = loc('Modify associated objects for [_1]', $CF->Name);
 
 my $Objects = $CollectionClass->new($session{'CurrentUser'});
+
+# If CF is a Group CF, only display user-defined groups
+if ($Class eq 'RT::Group') {
+    $Objects->LimitToUserDefinedGroups;
+}
+
 my (@results);
 my (@AssignedObjs, @UnassignedObjs);
 

Modified: rt/3.8/trunk/share/html/Admin/Elements/CustomFieldTabs
==============================================================================
--- rt/3.8/trunk/share/html/Admin/Elements/CustomFieldTabs	(original)
+++ rt/3.8/trunk/share/html/Admin/Elements/CustomFieldTabs	Mon Jan 12 20:58:18 2009
@@ -80,7 +80,7 @@
     };
 
 
-    if ($cf->LookupType =~ /^RT::Queue-/io) {
+    if ($cf->LookupType =~ /^RT::(?:Queue|Group)(?:\Z|-)/i) {
 	$tabs->{'this'}->{subtabs}->{D} = {
 	title => loc('Applies to'),
 	    path  => "Admin/CustomFields/Objects.html?id=" . $id,