[Rt-commit] rt branch, 4.0/custom-fields-groups, updated. rt-4.0.4-240-g1299ec2

[Thomas Sibley]

The branch, 4.0/custom-fields-groups has been updated
       via  1299ec2e0e72c30be68c099cf0945b95a863ae8a (commit)
       via  1e9ffa2533df2a2027936b9d3040979d1a194842 (commit)
       via  3ccc05359431fbfa63d054a4f9497ba980c11b28 (commit)
      from  327e043ed97e36a43c81b61ae4fbcc69e0c9fb04 (commit)

Summary of changes:
 share/html/Admin/Users/Modify.html          | 4 ++--
 share/html/Elements/EditLinks               | 4 +---
 share/html/SelfService/Create.html          | 7 ++++++-
 share/html/SelfService/Update.html          | 2 +-
 share/html/Ticket/Elements/EditCustomFields | 2 +-
 share/html/m/ticket/create                  | 7 ++++++-
 6 files changed, 17 insertions(+), 9 deletions(-)

- Log -----------------------------------------------------------------
commit 3ccc05359431fbfa63d054a4f9497ba980c11b28
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Oct 10 14:03:38 2012 -0700

    Correct typo resulting in no current user for the fallback value

diff --git a/share/html/Ticket/Elements/EditCustomFields b/share/html/Ticket/Elements/EditCustomFields
index fd5784f..9764e9a 100755
--- a/share/html/Ticket/Elements/EditCustomFields
+++ b/share/html/Ticket/Elements/EditCustomFields
@@ -58,7 +58,7 @@ $m->callback( %ARGS, CallbackName => 'MassageCustomFields', CustomFields => $Cus
 
 return $m->comp('/Elements/EditCustomFields',
     %ARGS,
-    Object => $TicketObj || RT::Ticket->new( $session{'CurrenUser'} ),
+    Object => $TicketObj || RT::Ticket->new( $session{'CurrentUser'} ),
     CustomFields => $CustomFields,
 );
 

commit 1e9ffa2533df2a2027936b9d3040979d1a194842
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Oct 10 14:21:36 2012 -0700

    Replace more uses of the now-deprecated /Ticket/Elements/EditCustomFields

diff --git a/share/html/Elements/EditLinks b/share/html/Elements/EditLinks
index 91fb80d..34e4140 100755
--- a/share/html/Elements/EditLinks
+++ b/share/html/Elements/EditLinks
@@ -158,9 +158,7 @@
     <td class="label"><& ShowRelationLabel, id => $id, Label => loc('Referred to by'), Relation => 'ReferredToBy' &>:</td>
     <td class="entry"> <input name="RefersTo-<%$id%>" /></td>
   </tr>
-% if ( $Object->isa('RT::Ticket') ) {
-  <& /Ticket/Elements/EditCustomFields, TicketObj => $Object, Group => 'Links', InTable => 1 &>
-% }
+  <& /Elements/EditCustomFields, Object => $Object, Group => 'Links', InTable => 1 &>
 % $m->callback( CallbackName => 'NewLink' );
 </table>
 </td>
diff --git a/share/html/SelfService/Create.html b/share/html/SelfService/Create.html
index 082e2b9..ea04090 100755
--- a/share/html/SelfService/Create.html
+++ b/share/html/SelfService/Create.html
@@ -88,7 +88,12 @@
 </tr>
 <tr>
     <td colspan="2">
-        <& /Ticket/Elements/EditCustomFields, %ARGS, QueueObj => $queue_obj &>
+        <& /Elements/EditCustomFields,
+            %ARGS,
+            Object          => RT::Ticket->new($session{CurrentUser}),
+            CustomFields    => $queue_obj->TicketCustomFields,
+            AsTable         => 0,
+            &>
     </td>
 </tr>
 <tr>
diff --git a/share/html/SelfService/Update.html b/share/html/SelfService/Update.html
index 2104105..e4d4b24 100755
--- a/share/html/SelfService/Update.html
+++ b/share/html/SelfService/Update.html
@@ -73,7 +73,7 @@
 
     </tr>
     <& /Ticket/Elements/AddAttachments, %ARGS, TicketObj => $Ticket &>
-    <tr><td colspan="2"><& /Ticket/Elements/EditCustomFields,  TicketObj => $Ticket &></td></tr>
+    <tr><td colspan="2"><& /Elements/EditCustomFields, Object => $Ticket, AsTable => 0 &></td></tr>
 </table>
 <& /Elements/MessageBox, 
     Name => "UpdateContent", 
diff --git a/share/html/m/ticket/create b/share/html/m/ticket/create
index 729e40c..2a51f08 100644
--- a/share/html/m/ticket/create
+++ b/share/html/m/ticket/create
@@ -331,7 +331,12 @@ $showrows->(
 
 </%perl>
 
-<& /Ticket/Elements/EditCustomFields, %ARGS, QueueObj => $QueueObj &>
+<& /Elements/EditCustomFields,
+    %ARGS,
+    Object          => RT::Ticket->new($session{CurrentUser}),
+    CustomFields    => $QueueObj->TicketCustomFields,
+    AsTable         => 0,
+    &>
 <& /Ticket/Elements/EditTransactionCustomFields, %ARGS, QueueObj => $QueueObj &>
 
 % if (exists $session{'Attachments'}) {

commit 1299ec2e0e72c30be68c099cf0945b95a863ae8a
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Oct 10 14:33:14 2012 -0700

    Avoid an uninitialized warning triggered by new user creation
    
    These warnings caused t/web/cf_groups_users.t to fail.

diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
index 51cd8e6..f63a458 100755
--- a/share/html/Admin/Users/Modify.html
+++ b/share/html/Admin/Users/Modify.html
@@ -323,7 +323,7 @@ if ($UserObj->Id && $id ne 'new') {
 
 
     # {{{ Deal with special fields: Privileged, Enabled
-    if  ( $SetPrivileged and $Privileged != $UserObj->Privileged ) {
+    if  ( $SetPrivileged and $Privileged != ($UserObj->Privileged || 0) ) {
          my ($code, $msg) = $UserObj->SetPrivileged($Privileged);
          push @results, loc('Privileged status: [_1]', loc_fuzzy($msg));
     }
@@ -384,7 +384,7 @@ $FreeformContactInfo => undef
 $Organization  => undef
 $RealName  => undef
 $NickName  => undef
-$Privileged => undef
+$Privileged => 0
 $SetPrivileged => undef
 $Enabled => undef
 $SetEnabled => undef

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