[rt-commit] [svn] r485 - in rt/branches: . autrijus-3.1/html/Admin/Elements autrijus-3.1/html/Ticket/Elements autrijus-3.1/lib/RT autrijus-3.1/lib/RT/I18N

[autrijus at fsck.com]

Author: autrijus
Date: Sun Mar  7 02:53:51 2004
New Revision: 485

Modified:
   rt/branches/   (props changed)
   rt/branches/autrijus-3.1/html/Admin/Elements/EditCustomFields
   rt/branches/autrijus-3.1/html/Ticket/Elements/EditCustomFields
   rt/branches/autrijus-3.1/lib/RT/CustomFields_Overlay.pm
   rt/branches/autrijus-3.1/lib/RT/I18N/zh_tw.po
   rt/branches/autrijus-3.1/lib/RT/Ticket_Overlay.pm
Log:
* ticket CF reclaimed


Modified: rt/branches/autrijus-3.1/html/Admin/Elements/EditCustomFields
==============================================================================
--- rt/branches/autrijus-3.1/html/Admin/Elements/EditCustomFields	(original)
+++ rt/branches/autrijus-3.1/html/Admin/Elements/EditCustomFields	Sun Mar  7 02:53:51 2004
@@ -42,12 +42,12 @@
 
 % if ($Object->Id) {
 <h3><&|/l&>Global Custom Fields</&></h3>
-<& PickCustomFields, CustomFields => \@GlobalCFs, ReadOnly => 1 &>
+<& PickCustomFields, CustomFields => \@GlobalCFs, ReadOnly => 1, id => $id &>
 % }
 <h3><&|/l&>Associated Custom Fields (uncheck to unassociate)</&></h3>
-<& PickCustomFields, CustomFields => [$ObjectCFs->CustomFields], id => $Object->Id, Checked => 1 &>
+<& PickCustomFields, CustomFields => [$ObjectCFs->CustomFields], id => $id, Checked => 1 &>
 <h3><&|/l&>Unassociated Custom Fields (check to associate)</&></h3>
-<& PickCustomFields, CustomFields => \@UnassociatedCFs, id => $Object->Id &>
+<& PickCustomFields, CustomFields => \@UnassociatedCFs, id => $id &>
 
 <& /Elements/Submit &>
 </FORM>

Modified: rt/branches/autrijus-3.1/html/Ticket/Elements/EditCustomFields
==============================================================================
--- rt/branches/autrijus-3.1/html/Ticket/Elements/EditCustomFields	(original)
+++ rt/branches/autrijus-3.1/html/Ticket/Elements/EditCustomFields	Sun Mar  7 02:53:51 2004
@@ -44,7 +44,7 @@
       <b><%$CustomField->Name%></b><br>
       <i><%$CustomField->FriendlyType%></i>
     </td>
-    <td class="entry"><& EditCustomField, TicketObj => $TicketObj, CustomField => $CustomField, NamePrefix => $NamePrefix &></td>
+    <td class="entry"><& /Elements/EditCustomField, Object => $TicketObj, CustomField => $CustomField, NamePrefix => $NamePrefix &></td>
   </tr>
 % }
 </table>
@@ -57,11 +57,11 @@
 my $NamePrefix;
 
 if ($TicketObj) {
- $CustomFields = $TicketObj->QueueObj->CustomFields();
+ $CustomFields = $TicketObj->CustomFields();
   $NamePrefix = "Ticket-".$TicketObj->Id."-CustomField-";
 
 } else {
- $CustomFields = $QueueObj->CustomFields();
+ $CustomFields = $QueueObj->TicketCustomFields();
   $NamePrefix = "CustomField-";
 }
 

Modified: rt/branches/autrijus-3.1/lib/RT/CustomFields_Overlay.pm
==============================================================================
--- rt/branches/autrijus-3.1/lib/RT/CustomFields_Overlay.pm	(original)
+++ rt/branches/autrijus-3.1/lib/RT/CustomFields_Overlay.pm	Sun Mar  7 02:53:51 2004
@@ -88,7 +88,7 @@
 		FIELD => 'ObjectId',
 		VALUE => "$queue")
       if defined $queue;
-  $self->LimitToObjectType( 'RT::Queue' );
+  $self->LimitToLookupType( 'RT::Queue-RT::Ticket' );
 }
 # }}}
 
@@ -110,7 +110,7 @@
                 ENTRYAGGREGATOR => 'OR',
 		FIELD => 'ObjectId',
 		VALUE => 0);
-  $self->LimitToObjectType( 'RT::Queue' );
+  $self->LimitToLookupType( 'RT::Queue-RT::Ticket' );
 }
 # }}}
 
@@ -208,17 +208,16 @@
     my $self = shift;
     my $id = shift || 0;
 
-    my $object_cfs = $self->NewAlias('ObjectCustomFields');
     $self->Join( ALIAS1 => 'main',
                 FIELD1 => 'id',
-                ALIAS2 => $object_cfs,
+                ALIAS2 => $self->_OCFAlias,
                 FIELD2 => 'CustomField' );
-    $self->Limit( ALIAS           => $object_cfs,
+    $self->Limit( ALIAS           => $self->_OCFAlias,
                  FIELD           => 'ObjectId',
                  OPERATOR        => '=',
                  VALUE           => $id,
                  ENTRYAGGREGATOR => 'OR' );
-    $self->Limit( ALIAS           => $object_cfs,
+    $self->Limit( ALIAS           => $self->_OCFAlias,
                  FIELD           => 'ObjectId',
                  OPERATOR        => '=',
                  VALUE           => 0,

Modified: rt/branches/autrijus-3.1/lib/RT/I18N/zh_tw.po
==============================================================================
--- rt/branches/autrijus-3.1/lib/RT/I18N/zh_tw.po	(original)
+++ rt/branches/autrijus-3.1/lib/RT/I18N/zh_tw.po	Sun Mar  7 02:53:51 2004
@@ -1816,7 +1816,7 @@
 #: html/Admin/CustomFields/index.html:14
 #. ($lookup)
 msgid "Custom Fields of %1"
-msgstr "%1的自訂欄位"
+msgstr "「%1」的自訂欄位"
 
 #: NOT FOUND IN SOURCE
 msgid "Custom Fields which apply to all queues"
@@ -2824,7 +2824,7 @@
 
 #: html/Admin/Elements/EditCustomFields:44
 msgid "Global Custom Fields"
-msgstr ""
+msgstr "全域自訂欄位"
 
 #: NOT FOUND IN SOURCE
 msgid "Global Keyword Selections"

Modified: rt/branches/autrijus-3.1/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/autrijus-3.1/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/autrijus-3.1/lib/RT/Ticket_Overlay.pm	Sun Mar  7 02:53:51 2004
@@ -3878,7 +3878,7 @@
 
 # }}}
 
-sub _CustomFieldComposites {
+sub _LookupTypes {
     "RT::Queue-RT::Ticket";
 }