[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.6-68-gfb984b6

[Alex M Vandiver]

The branch, 3.8-trunk has been updated
       via  fb984b624e4f3d2d301e88bad38c1ef6180c18db (commit)
       via  c81489178f7b58bd15ec6e3a4cc182574233c18b (commit)
      from  d17c5d0a96ce3a497bde93addcbb879925a1fd6f (commit)

Summary of changes:
 share/html/Ticket/Create.html |  109 ++++++++++++++++++++++-------------------
 1 files changed, 58 insertions(+), 51 deletions(-)

- Log -----------------------------------------------------------------
commit c81489178f7b58bd15ec6e3a4cc182574233c18b
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Nov 3 11:39:52 2009 -0500

    Perltidy

diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index 6daec7b..9ea1ea4 100755
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -250,77 +250,80 @@ $m->callback( CallbackName => "Init", ARGSRef => \%ARGS );
 my $Queue = $ARGS{Queue};
 
 my $CloneTicketObj;
-if ( $CloneTicket ) {
+if ($CloneTicket) {
     $CloneTicketObj = RT::Ticket->new( $session{CurrentUser} );
-    $CloneTicketObj->Load($CloneTicket) or Abort(loc("Ticket could not be loaded"));
-    
+    $CloneTicketObj->Load($CloneTicket)
+        or Abort( loc("Ticket could not be loaded") );
+
     my $clone = {
-        Requestors       => join( ',', $CloneTicketObj->RequestorAddresses ),
-        Cc               => join( ',', $CloneTicketObj->CcAddresses),
-        AdminCc          => join( ',', $CloneTicketObj->AdminCcAddresses),
-        InitialPriority => $CloneTicketObj->Priority, 
+        Requestors => join( ',', $CloneTicketObj->RequestorAddresses ),
+        Cc         => join( ',', $CloneTicketObj->CcAddresses ),
+        AdminCc    => join( ',', $CloneTicketObj->AdminCcAddresses ),
+        InitialPriority => $CloneTicketObj->Priority,
     };
-    
-    $clone->{$_} = $CloneTicketObj->$_() 
-        for qw/Owner Subject FinalPriority TimeEstimated TimeWorked 
-                Status TimeLeft Starts Started Due Resolved/;
-    
-        my $members = $CloneTicketObj->Members;
-        my ( @members, @members_of, @refers, @refers_by, @depends, @depends_by );
-        my $refers = $CloneTicketObj->RefersTo;
-        while ( my $refer = $refers->Next ) {
-            push @refers, $refer->LocalTarget;
+
+    $clone->{$_} = $CloneTicketObj->$_()
+        for qw/Owner Subject FinalPriority TimeEstimated TimeWorked
+        Status TimeLeft Starts Started Due Resolved/;
+
+    my $members = $CloneTicketObj->Members;
+    my ( @members, @members_of, @refers, @refers_by, @depends, @depends_by );
+    my $refers = $CloneTicketObj->RefersTo;
+    while ( my $refer = $refers->Next ) {
+        push @refers, $refer->LocalTarget;
+    }
+    $clone->{'new-RefersTo'} = join ' ', @refers;
+
+    my $refers_by = $CloneTicketObj->ReferredToBy;
+    while ( my $refer_by = $refers_by->Next ) {
+        push @refers_by, $refer_by->LocalBase;
+    }
+    $clone->{'RefersTo-new'} = join ' ', @refers_by;
+    if (0) {    # Temporarily disabled
+        my $depends = $CloneTicketObj->DependsOn;
+        while ( my $depend = $depends->Next ) {
+            push @depends, $depend->LocalTarget;
         }
-        $clone->{'new-RefersTo'} = join ' ', @refers;
-    
-        my $refers_by = $CloneTicketObj->ReferredToBy;
-        while ( my $refer_by = $refers_by->Next ) {
-            push @refers_by, $refer_by->LocalBase;
+        $clone->{'new-DependsOn'} = join ' ', @depends;
+
+        my $depends_by = $CloneTicketObj->DependedOnBy;
+        while ( my $depend_by = $depends_by->Next ) {
+            push @depends_by, $depend_by->LocalBase;
         }
-        $clone->{'RefersTo-new'} = join ' ', @refers_by;
-        if (0) { # Temporarily disabled
-            my $depends = $CloneTicketObj->DependsOn;
-            while ( my $depend = $depends->Next ) {
-                push @depends, $depend->LocalTarget;
-            }
-            $clone->{'new-DependsOn'} = join ' ', @depends;
-
-            my $depends_by = $CloneTicketObj->DependedOnBy;
-            while ( my $depend_by = $depends_by->Next ) {
-                push @depends_by, $depend_by->LocalBase;
-            }
-            $clone->{'DependsOn-new'} = join ' ', @depends_by;
-
-            while ( my $member = $members->Next ) {
-                push @members, $member->LocalBase;
-            }
-            $clone->{'MemberOf-new'} = join ' ', @members;
-
-            my $members_of = $CloneTicketObj->MemberOf;
-            while ( my $member_of = $members_of->Next ) {
-                push @members_of, $member_of->LocalTarget;
-            }
-            $clone->{'new-MemberOf'} = join ' ', @members_of;
+        $clone->{'DependsOn-new'} = join ' ', @depends_by;
 
+        while ( my $member = $members->Next ) {
+            push @members, $member->LocalBase;
         }
-    
+        $clone->{'MemberOf-new'} = join ' ', @members;
+
+        my $members_of = $CloneTicketObj->MemberOf;
+        while ( my $member_of = $members_of->Next ) {
+            push @members_of, $member_of->LocalTarget;
+        }
+        $clone->{'new-MemberOf'} = join ' ', @members_of;
+
+    }
+
     my $cfs = $CloneTicketObj->QueueObj->TicketCustomFields();
     while ( my $cf = $cfs->Next ) {
-        my $cf_id = $cf->id;
+        my $cf_id     = $cf->id;
         my $cf_values = $CloneTicketObj->CustomFieldValues( $cf->id );
         my @cf_values;
         while ( my $cf_value = $cf_values->Next ) {
             push @cf_values, $cf_value->Content;
         }
-        $clone->{"Object-RT::Ticket--CustomField-$cf_id-Value"} 
-            = join "\n", @cf_values;
+        $clone->{"Object-RT::Ticket--CustomField-$cf_id-Value"} = join "\n",
+            @cf_values;
     }
-    
+
     for ( keys %$clone ) {
         $ARGS{$_} = $clone->{$_} if not defined $ARGS{$_};
     }
 
 }
+
+
 my @results;
 my $QueueObj = new RT::Queue($session{'CurrentUser'});
 $QueueObj->Load($Queue) || Abort(loc("Queue could not be loaded."));

commit fb984b624e4f3d2d301e88bad38c1ef6180c18db
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Nov 3 12:59:23 2009 -0500

    Only set time values on clone if they are non-zero

diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index 9ea1ea4..0f817ab 100755
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -264,7 +264,11 @@ if ($CloneTicket) {
 
     $clone->{$_} = $CloneTicketObj->$_()
         for qw/Owner Subject FinalPriority TimeEstimated TimeWorked
-        Status TimeLeft Starts Started Due Resolved/;
+        Status TimeLeft/;
+
+    $clone->{$_} = $CloneTicketObj->$_->AsString
+        for grep { $CloneTicketObj->$_->Unix }
+        map      { $_ . "Obj" } qw/Starts Started Due Resolved/;
 
     my $members = $CloneTicketObj->Members;
     my ( @members, @members_of, @refers, @refers_by, @depends, @depends_by );

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