[Rt-commit] r19860 - rtir/2.5/trunk/html/Callbacks/RTIR/Ticket/Elements/EditCustomFields

[ruz at bestpractical.com]

Author: ruz
Date: Wed Jun  3 05:48:08 2009
New Revision: 19860

Modified:
   rtir/2.5/trunk/html/Callbacks/RTIR/Ticket/Elements/EditCustomFields/MassageCustomFields

Log:
* fix hiding RTIR's special custom fields

Modified: rtir/2.5/trunk/html/Callbacks/RTIR/Ticket/Elements/EditCustomFields/MassageCustomFields
==============================================================================
--- rtir/2.5/trunk/html/Callbacks/RTIR/Ticket/Elements/EditCustomFields/MassageCustomFields	(original)
+++ rtir/2.5/trunk/html/Callbacks/RTIR/Ticket/Elements/EditCustomFields/MassageCustomFields	Wed Jun  3 05:48:08 2009
@@ -5,9 +5,13 @@
 </%args>
 <%init>
 my $queue = $QueueObj || $TicketObj->QueueObj;
-if ( RT::IR->OurQueue( $queue ) ) {
-    # We never want to see the RTIR custom fields State and Constituency in the edity ui
-    $CustomFields->Limit( FIELD => 'Name', OPERATOR => '!=', VALUE => 'State');
-    $CustomFields->Limit( FIELD => 'Name', OPERATOR => '!=', VALUE => 'Constituency');
-}
+return unless RT::IR->OurQueue( $queue );
+
+my $on_create = $QueueObj && !($TicketObj && $TicketObj->id);
+
+# We never want to see the RTIR custom fields State and Constituency in the edity ui
+$CustomFields->_OpenParen('RTIR');
+$CustomFields->Limit( SUBCLAUSE => 'RTIR', ENTRYAGGREGATOR => 'AND', FIELD => 'Name', OPERATOR => '!=', VALUE => 'State');
+$CustomFields->Limit( SUBCLAUSE => 'RTIR', ENTRYAGGREGATOR => 'AND', FIELD => 'Name', OPERATOR => '!=', VALUE => 'Constituency');
+$CustomFields->_CloseParen('RTIR');
 </%init>