[Rt-commit] r2540 - in rtfm/branches/2.1-TESTING/html/RTFM/Article: . Elements

[tla at bestpractical.com]

Author: tla
Date: Wed Mar 30 19:19:54 2005
New Revision: 2540

Modified:
   rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditCustomFields
   rtfm/branches/2.1-TESTING/html/RTFM/Article/ExtractFromTicket.html
Log:
Fix custom field stuff so that articles can be extracted from tickets.
Not worrying about single vs. multi-entry yet; will probably have to
go back and fix that.


Modified: rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditCustomFields
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditCustomFields	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditCustomFields	Wed Mar 30 19:19:54 2005
@@ -18,7 +18,6 @@
 
 <table>
 % while (my $CustomField = $CustomFields->Next()) {
-1
   <tr>
     <td class="labeltop">
       <b><%$CustomField->Name%></b><br>
@@ -28,7 +27,7 @@
         Object => $ArticleObj, 
         CustomField => $CustomField, 
         NamePrefix => $NamePrefix,
-        Content => $CFContent->{$CustomField->Id}
+        Default => $CFContent->{$CustomField->Id}
         &></td>
   </tr>
 % }

Modified: rtfm/branches/2.1-TESTING/html/RTFM/Article/ExtractFromTicket.html
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Article/ExtractFromTicket.html	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Article/ExtractFromTicket.html	Wed Mar 30 19:19:54 2005
@@ -60,9 +60,10 @@
 unless ($ClassObj->Id) {
     $m->comp("/RTFM/Elements/Error", Why => "'%1' isn't a valid class identifier", $Class);
 }
-my     $CustomFields = $ClassObj->CustomFields();
-$CustomFields->Limit(FIELD => 'Type', OPERATOR => '=', VALUE => 'TextSingle');
-$CustomFields->Limit(FIELD => 'Type', OPERATOR => '=', VALUE => 'WikiTextSingle');
+my     $CustomFields = $ClassObj->ArticleCustomFields();
+
+$CustomFields->Limit(FIELD => 'Type', OPERATOR => '=', VALUE => 'Text');
+$CustomFields->Limit(FIELD => 'Type', OPERATOR => '=', VALUE => 'Freeform');
 </%init>
 <%ARGS>
 $Class=>undef