[Rt-commit] r16550 - in rt/branches/3.999-DANGEROUS: lib/RT/Action

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Mon Oct 27 00:22:58 2008
New Revision: 16550

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/lib/RT/Action/EditTicketCFs.pm

Log:
 r17400 at sunnavys-mb:  sunnavy | 2008-10-27 12:21:02 +0800
 msg support for cf action


Modified: rt/branches/3.999-DANGEROUS/lib/RT/Action/EditTicketCFs.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Action/EditTicketCFs.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Action/EditTicketCFs.pm	Mon Oct 27 00:22:58 2008
@@ -30,7 +30,6 @@
     return $available;
 }
 
-
 =head2 take_action
 
 =cut
@@ -51,10 +50,17 @@
         for my $tbd (@to_be_deleted) {
             if ( $tbd =~ /delete_(\d+)_(\d+)/ ) {
                 my ( $cfid, $ocfvid ) = ( $1, $2 );
-                $ticket->delete_custom_field_value(
+                my $cf =
+                  RT::Model::CustomField->new(
+                    current_user => Jifty->web->current_user );
+                $cf->load_by_id($cfid);
+                my ( $val, $msg ) = $ticket->delete_custom_field_value(
                     field    => $cfid,
                     value_id => $ocfvid,
                 );
+                Jifty->log->error($msg) unless $val;
+                push @{ $self->result->content('detailed_messages')
+                      ->{ $cf->name } }, $msg;
             }
         }
 
@@ -78,12 +84,15 @@
                 $filename =~ s#^.*[\\/]##;
                 binmode($new_values);
 
-                $ticket->add_custom_field_value(
+                my ( $val, $msg ) = $ticket->add_custom_field_value(
                     field         => $cfid,
                     value         => $filename,
                     large_content => do { local $/; scalar <$new_values> },
                     content_type  => $upload_info->{'Content-Type'},
                 );
+                Jifty->log->error($msg) unless $val;
+                push @{ $self->result->content('detailed_messages')
+                      ->{ $cf->name } }, $msg;
             }
             else {
 
@@ -99,9 +108,8 @@
                     else {
 
                         # freeform or select values like 'two', 'three'
-                        $new_values = [
-                            grep defined && length, split /\r*\n/, $new_values
-                        ];
+                        $new_values = [ grep defined && length, split /\r*\n/,
+                            $new_values ];
                     }
                 }
 
@@ -116,17 +124,23 @@
                             next;
                         }
                         $delete_flag ||= 1;
-                        $ticket->delete_custom_field_value(
+                        my ( $val, $msg ) = $ticket->delete_custom_field_value(
                             field    => $cfid,
                             value_id => $old_cf->id,
                         );
+                        Jifty->log->error($msg) unless $val;
+                        push @{ $self->result->content('detailed_messages')
+                              ->{ $cf->name } }, $msg;
                     }
                 }
                 for my $new_value (@$new_values) {
-                    $ticket->add_custom_field_value(
+                    my ( $val, $msg ) = $ticket->add_custom_field_value(
                         field => $cfid,
                         value => $new_value,
                     );
+                    Jifty->log->error($msg) unless $val;
+                    push @{ $self->result->content('detailed_messages')
+                          ->{ $cf->name } }, $msg;
                 }
             }
         }