[Rt-commit] r12616 - in rt/branches/3.8-TESTING: . share/html/Admin/Elements share/html/Admin/Global/CustomFields share/html/Admin/Queues

[elacour at bestpractical.com]

Author: elacour
Date: Thu May 22 08:46:11 2008
New Revision: 12616

Modified:
   rt/branches/3.8-TESTING/   (props changed)
   rt/branches/3.8-TESTING/lib/RT/CustomField_Overlay.pm
   rt/branches/3.8-TESTING/share/html/Admin/Elements/CustomFieldTabs
   rt/branches/3.8-TESTING/share/html/Admin/Elements/GlobalCustomFieldTabs
   rt/branches/3.8-TESTING/share/html/Admin/Global/CustomFields/index.html
   rt/branches/3.8-TESTING/share/html/Admin/Queues/Modify.html

Log:
 r8922 at datura:  manu | 2008-05-22 14:45:41 +0200
 RT-Ticket: 9356
 RT-Status: resolved
 RT-Update: correspond
 
 Add support for queues customfields.
 


Modified: rt/branches/3.8-TESTING/lib/RT/CustomField_Overlay.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/CustomField_Overlay.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/CustomField_Overlay.pm	Thu May 22 08:46:11 2008
@@ -105,6 +105,7 @@
 RT::CustomField->_ForObjectType(
     'RT::Queue-RT::Ticket-RT::Transaction' => "Ticket Transactions", );    #loc
 RT::CustomField->_ForObjectType( 'RT::User'  => "Users", );                           #loc
+RT::CustomField->_ForObjectType( 'RT::Queue'  => "Queues", );                         #loc
 RT::CustomField->_ForObjectType( 'RT::Group' => "Groups", );                          #loc
 
 our $RIGHTS = {

Modified: rt/branches/3.8-TESTING/share/html/Admin/Elements/CustomFieldTabs
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Admin/Elements/CustomFieldTabs	(original)
+++ rt/branches/3.8-TESTING/share/html/Admin/Elements/CustomFieldTabs	Thu May 22 08:46:11 2008
@@ -80,7 +80,7 @@
     };
 
 
-    if ($cf->LookupType =~ /^RT::Queue/io) {
+    if ($cf->LookupType =~ /^RT::Queue-/io) {
 	$tabs->{'this'}->{subtabs}->{D} = {
 	title => loc('Applies to'),
 	    path  => "Admin/CustomFields/Objects.html?id=" . $id,

Modified: rt/branches/3.8-TESTING/share/html/Admin/Elements/GlobalCustomFieldTabs
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Admin/Elements/GlobalCustomFieldTabs	(original)
+++ rt/branches/3.8-TESTING/share/html/Admin/Elements/GlobalCustomFieldTabs	Thu May 22 08:46:11 2008
@@ -65,6 +65,12 @@
         path => 'Admin/Global/CustomFields/Groups.html',
     },
 
+    C => {
+        title => loc('Queues'),
+        text => loc('Select custom fields for all queues'),
+        path => 'Queues.html',
+    },
+
     F => {
         title => loc('Tickets'),
         text => loc('Select custom fields for tickets in all queues'),

Modified: rt/branches/3.8-TESTING/share/html/Admin/Global/CustomFields/index.html
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Admin/Global/CustomFields/index.html	(original)
+++ rt/branches/3.8-TESTING/share/html/Admin/Global/CustomFields/index.html	Thu May 22 08:46:11 2008
@@ -73,6 +73,12 @@
         path  => 'Groups.html',
     },
 
+    C => {
+        title => loc('Queues'),
+        text  => loc('Select custom fields for all queues'),
+        path  => 'Queues.html',
+    },
+
     F => {
         title => loc('Tickets'),
         text  => loc('Select custom fields for tickets in all queues'),

Modified: rt/branches/3.8-TESTING/share/html/Admin/Queues/Modify.html
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Admin/Queues/Modify.html	(original)
+++ rt/branches/3.8-TESTING/share/html/Admin/Queues/Modify.html	Thu May 22 08:46:11 2008
@@ -89,6 +89,18 @@
 <td colspan="3"><input name="DefaultDueIn" value="<% ($Create) ? "" : $QueueObj->DefaultDueIn%>" /> <&|/l&>days</&>.</td>
 </tr>
 
+% my $CFs = $QueueObj->CustomFields;
+% while (my $CF = $CFs->Next) {
+<tr valign="top"><td align="right">
+<% $CF->Name %>:
+</td><td>
+<& /Elements/EditCustomField, CustomField => $CF, 
+                              Object => $QueueObj, 
+                              ($Create ? (NamePrefix => 'Object-RT::Queue--CustomField-') 
+                                       : () )&>
+</td></tr>
+% }
+
 % if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
 <tr><td align="right"><input type="checkbox" class="checkbox" name="Sign" value="1" <% $QueueObj->Sign? 'checked': '' %> /></td>
 <td><&|/l&>Sign by default</&></td>
@@ -171,6 +183,7 @@
         CallbackName => 'ProcessLinks'
     );
     push @results, @linkresults;
+    push @results, ProcessObjectCustomFieldUpdates( ARGSRef => \%ARGS, Object => $QueueObj );
 }
 </%INIT>