[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.0rc4-24-g70e2687

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  70e268780b2f1138879f4386f6773189a4113c60 (commit)
      from  fe8ee2e80da2204faafcdf21254e6481344b0928 (commit)

Summary of changes:
 share/html/Ticket/Elements/EditBasics |   22 ++++++++++------------
 share/html/Ticket/ModifyAll.html      |    2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

- Log -----------------------------------------------------------------
commit 70e268780b2f1138879f4386f6773189a4113c60
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Jan 27 17:28:37 2011 -0500

    Revert "Showing Starts in two places on the page leads to both JS and update errors"
    
    Status != Starts; the Starts field in question was being added by a
    callback.
    
    This reverts commit 4195dd1d8d48a097f863137f4481b01cd2f4ec4f.

diff --git a/share/html/Ticket/Elements/EditBasics b/share/html/Ticket/Elements/EditBasics
index e2511f3..35e90ec 100755
--- a/share/html/Ticket/Elements/EditBasics
+++ b/share/html/Ticket/Elements/EditBasics
@@ -49,7 +49,6 @@
 $TicketObj => undef
 @fields => ()
 $InTable => 0
-$NoDates => 0
 %defaults => ()
 </%ARGS>
 <%INIT>
@@ -58,17 +57,16 @@ unless ( @fields ) {
         {   name => 'Subject',
             html => '<input name="Subject" value="'.$m->interp->apply_escapes( $defaults{'Subject'} || $TicketObj->Subject, 'h' ).'" />',
         },
-        ( $NoDates ? () :
-            {   name => 'Status',
-                comp => '/Elements/SelectStatus',
-                args => {
-                    Name => 'Status',
-                    DefaultLabel => loc("[_1] (Unchanged)",loc($TicketObj->Status)),
-                    Default => $defaults{'Status'} || undef,
-                    TicketObj => $TicketObj,
-                    QueueObj => $TicketObj->QueueObj,
-                },
-            }),
+        {   name => 'Status',
+            comp => '/Elements/SelectStatus',
+            args => {
+                Name => 'Status',
+                DefaultLabel => loc("[_1] (Unchanged)",loc($TicketObj->Status)),
+                Default => $defaults{'Status'} || undef,
+                TicketObj => $TicketObj,
+                QueueObj => $TicketObj->QueueObj,
+            },
+        },
         {   name => 'Queue',
             comp => '/Elements/SelectQueue',
             args => {
diff --git a/share/html/Ticket/ModifyAll.html b/share/html/Ticket/ModifyAll.html
index 8cad009..b1ebe8b 100755
--- a/share/html/Ticket/ModifyAll.html
+++ b/share/html/Ticket/ModifyAll.html
@@ -56,7 +56,7 @@
 <input type="hidden" class="hidden" name="id" value="<%$Ticket->Id%>" />
 
 <&| /Widgets/TitleBox, title => loc('Modify ticket # [_1]', $Ticket->Id), class=>'ticket-info-basics' &>
-<& Elements/EditBasics, TicketObj => $Ticket, NoDates => 1 &>
+<& Elements/EditBasics, TicketObj => $Ticket &>
 <& Elements/EditCustomFields, TicketObj => $Ticket &>
 </&>
 

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