[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.6-342-g4195dd1

[Alex Vandiver]

The branch, 3.9-trunk has been updated
       via  4195dd1d8d48a097f863137f4481b01cd2f4ec4f (commit)
      from  08ebfc555e876ecf7f73442fcee06aae0d36207d (commit)

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

- Log -----------------------------------------------------------------
commit 4195dd1d8d48a097f863137f4481b01cd2f4ec4f
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Dec 2 18:43:45 2010 -0500

    Showing Starts in two places on the page leads to both JS and update errors
    
    Hide the Starts field in Basics if we also show a specific Dates widget

diff --git a/share/html/Ticket/Elements/EditBasics b/share/html/Ticket/Elements/EditBasics
index 35e90ec..e2511f3 100755
--- a/share/html/Ticket/Elements/EditBasics
+++ b/share/html/Ticket/Elements/EditBasics
@@ -49,6 +49,7 @@
 $TicketObj => undef
 @fields => ()
 $InTable => 0
+$NoDates => 0
 %defaults => ()
 </%ARGS>
 <%INIT>
@@ -57,16 +58,17 @@ unless ( @fields ) {
         {   name => 'Subject',
             html => '<input name="Subject" value="'.$m->interp->apply_escapes( $defaults{'Subject'} || $TicketObj->Subject, 'h' ).'" />',
         },
-        {   name => 'Status',
-            comp => '/Elements/SelectStatus',
-            args => {
-                Name => 'Status',
-                DefaultLabel => loc("[_1] (Unchanged)",loc($TicketObj->Status)),
-                Default => $defaults{'Status'} || undef,
-                TicketObj => $TicketObj,
-                QueueObj => $TicketObj->QueueObj,
-            },
-        },
+        ( $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 => 'Queue',
             comp => '/Elements/SelectQueue',
             args => {
diff --git a/share/html/Ticket/ModifyAll.html b/share/html/Ticket/ModifyAll.html
index 2822072..2339975 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 &>
+<& Elements/EditBasics, TicketObj => $Ticket, NoDates => 1 &>
 <& Elements/EditCustomFields, TicketObj => $Ticket &>
 </&>
 

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