[Rt-commit] rt branch, admin_ui, updated. 0000ce039e61188ba39742233412e666ccaa26e2

[sunnavy at bestpractical.com]

The branch, admin_ui has been updated
       via  0000ce039e61188ba39742233412e666ccaa26e2 (commit)
      from  7e93ec148f8b0949f90d289e1126acdb98ee5792 (commit)

Summary of changes:
 lib/RT/Action/SelectCustomFields.pm |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit 0000ce039e61188ba39742233412e666ccaa26e2
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Dec 11 11:55:38 2009 +0800

    RT::System  is not right for SelectCustomFields action

diff --git a/lib/RT/Action/SelectCustomFields.pm b/lib/RT/Action/SelectCustomFields.pm
index 40d734e..0cb0582 100644
--- a/lib/RT/Action/SelectCustomFields.pm
+++ b/lib/RT/Action/SelectCustomFields.pm
@@ -25,7 +25,7 @@ sub arguments {
     };
 
     my $global_cfs;
-    unless ( ref $self->object eq 'RT::System' ) {
+    if ( $self->object->id ) {
         $global_cfs = RT::Model::ObjectCustomFieldCollection->new;
         $global_cfs->find_all_rows;
         $global_cfs->limit_to_object_id(0);
@@ -90,18 +90,16 @@ sub take_action {
     return unless $lookup_type;
     $self->lookup_type($lookup_type);
 
-    if ( $object_type eq 'RT::System' ) {
-        $self->object( RT->system );
-    }
-    elsif ( $RT::Model::ACE::OBJECT_TYPES{$object_type} ) {
+    if ( $RT::Model::ACE::OBJECT_TYPES{$object_type} ) {
         my $object    = $object_type->new;
         my $object_id = $self->argument_value('object_id');
-        $object->load($object_id);
-        unless ( $object->id ) {
-            Jifty->log->error("couldn't load $object_type #$object_id");
-            return;
+        if ($object_id) {
+            $object->load($object_id);
+            unless ( $object->id ) {
+                Jifty->log->error("couldn't load $object_type #$object_id");
+                return;
+            }
         }
-
         $self->object($object);
     }
     else {

-----------------------------------------------------------------------