[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-466-g5a798ed

[Shawn Moore]

The branch, 3.9-trunk has been updated
       via  5a798edc1950047b50bcb56c7fc5646936456d07 (commit)
       via  ed0c0daaaf2a6a49d5e2c497e1e2a9912e7de79f (commit)
       via  19ac676afd8a4b0ae4274db1c873eeef54e7c0d4 (commit)
       via  9606c113cb7671c6964c8a5b29e697f0ba577d9e (commit)
      from  823b34096dc9c926b1da524c8de11bf4b4fc54eb (commit)

Summary of changes:
 share/html/Ticket/Create.html                      |    2 +-
 .../Ticket/Elements/EditTransactionCustomFields    |   18 ++++++++++++------
 share/html/Ticket/ModifyAll.html                   |   13 ++-----------
 share/html/Ticket/Update.html                      |    2 +-
 4 files changed, 16 insertions(+), 19 deletions(-)

- Log -----------------------------------------------------------------
commit 9606c113cb7671c6964c8a5b29e697f0ba577d9e
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri Nov 12 18:33:17 2010 -0500

    Give EditTransactionCustomFields an AsTable option
    
        To more closely mirror EditCustomFields

diff --git a/share/html/Ticket/Elements/EditTransactionCustomFields b/share/html/Ticket/Elements/EditTransactionCustomFields
index 6d9fc73..1f2b28e 100644
--- a/share/html/Ticket/Elements/EditTransactionCustomFields
+++ b/share/html/Ticket/Elements/EditTransactionCustomFields
@@ -46,23 +46,25 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 % $m->callback( CallbackName => 'BeforeTransactionCustomFields', TicketObj => $TicketObj, QueueObj => $QueueObj, NamePrefix => $NamePrefix );
+<div class="edit-transaction-custom-fields">
 % if ($CustomFields->Count) {
 % while (my $CF = $CustomFields->Next()) {
 % next unless $CF->CurrentUserHasRight('ModifyCustomField');
-<tr>
-<td class="label cflabel">
+<<% $FIELD %>>
+<<% $CELL %> class="label cflabel">
   <span class="name"><% loc($CF->Name) %>:</span><br />
   <span class="type"><% $CF->FriendlyType %></span>
-</td>
-<td>
+</<% $CELL %>>
+<<% $CELL %>>
 <& /Elements/EditCustomField,
     CustomField => $CF,
     NamePrefix => $NamePrefix
 &>
-</td>
-</tr>
+</<% $CELL %>>
+</<% $FIELD %>>
 % }
 % }
+</div>
 % $m->callback( CallbackName => 'AfterTransactionCustomFields', TicketObj => $TicketObj, QueueObj => $QueueObj, NamePrefix => $NamePrefix );
 
 <%INIT>
@@ -76,10 +78,14 @@ if ($TicketObj) {
 
 $m->callback( CallbackName => 'MassageTransactionCustomFields', CustomFields => $CustomFields );
 
+my $FIELD = $AsTable ? 'tr' : 'div';
+my $CELL  = $AsTable ? 'td' : 'div';
+
 </%INIT>
 <%ARGS>
 $NamePrefix => "Object-RT::Transaction--CustomField-"
 $TicketObj => undef
 $QueueObj => undef
+$AsTable => 0
 </%ARGS>
 

commit 19ac676afd8a4b0ae4274db1c873eeef54e7c0d4
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri Nov 12 18:33:52 2010 -0500

    Make Create.html TxnCFs a table to more closely match TicketCFs

diff --git a/share/html/Ticket/Create.html b/share/html/Ticket/Create.html
index a6fc369..daeb5c5 100755
--- a/share/html/Ticket/Create.html
+++ b/share/html/Ticket/Create.html
@@ -102,7 +102,7 @@
 % $m->callback( CallbackName => 'AfterOwner', ARGSRef => \%ARGS );
 
       <& /Ticket/Elements/EditCustomFields, %ARGS, QueueObj => $QueueObj, AsTable => 1 &>
-      <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj &>
+      <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj, AsTable => 1 &>
     </table>
   </&>
 % $m->callback( CallbackName => 'AfterBasics', QueueObj => $QueueObj );

commit ed0c0daaaf2a6a49d5e2c497e1e2a9912e7de79f
Author: Matt Zagrabelny <mzagrabe at d.umn.edu>
Date:   Fri Nov 12 18:34:27 2010 -0500

    Use EditTransactionCustomFields in ModifyAll
    
        (instead of reinventing it poorly)

diff --git a/share/html/Ticket/ModifyAll.html b/share/html/Ticket/ModifyAll.html
index 5697d69..f86f8dd 100755
--- a/share/html/Ticket/ModifyAll.html
+++ b/share/html/Ticket/ModifyAll.html
@@ -102,17 +102,8 @@
     <td class="label"><&|/l&>Subject</&>:</td>
     <td class="entry"><input name="UpdateSubject" size="60" value="<%$Ticket->Subject%>" /></td>
   </tr>
-% if (my $TxnCFs = $Ticket->TransactionCustomFields) {
-%    while (my $CF = $TxnCFs->Next()) {
-<tr>
-<td class="label"><% loc($CF->Name) %>:</td>
-<td class="entry"><& /Elements/EditCustomField, 
-    CustomField => $CF, 
-    NamePrefix => "Object-RT::Transaction--CustomField-"
-    &><em><% $CF->FriendlyType %></em>
-</td></tr>
-%    } # end if while
-% } # end of if
+
+  <tr><td colspan="2"><& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $Ticket &></td></tr>
 
 <& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
 

commit 5a798edc1950047b50bcb56c7fc5646936456d07
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Mon Nov 15 14:10:18 2010 -0500

    Integrate EditTxnCFs into the table of fields

diff --git a/share/html/Ticket/Update.html b/share/html/Ticket/Update.html
index ba04934..6582719 100755
--- a/share/html/Ticket/Update.html
+++ b/share/html/Ticket/Update.html
@@ -136,7 +136,7 @@
 
 % $m->callback( %ARGS, CallbackName => 'AfterWorked', Ticket => $TicketObj );
 
-    <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $TicketObj &>
+<& /Ticket/Elements/EditTransactionCustomFields, %ARGS, TicketObj => $TicketObj, AsTable => 1 &>
 
   </table>
   </&>

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