[Rt-commit] r3878 - in rtfm/branches/2.1-TESTING: . bin html/RTFM/Article/Elements lib/RT/FM

[alexmv at bestpractical.com]

Author: alexmv
Date: Thu Sep 22 15:10:33 2005
New Revision: 3878

Removed:
   rtfm/branches/2.1-TESTING/bin/populate-database
Modified:
   rtfm/branches/2.1-TESTING/   (props changed)
   rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditCustomFields
   rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/Preformatted
   rtfm/branches/2.1-TESTING/lib/RT/FM/Class_Overlay.pm
Log:
 r6460 at zoq-fot-pik:  chmrr | 2005-09-22 15:10:06 -0400
  * Clean up things that used the old CF API


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	Thu Sep 22 15:10:33 2005
@@ -41,7 +41,7 @@
 my $NamePrefix;
 
 if ($ArticleObj->id && $ArticleObj->ClassObj->id) {
-    $CustomFields = $ArticleObj->ClassObj->ArticleCustomFields();
+    $CustomFields = $ArticleObj->CustomFields();
     $NamePrefix = "Object-RT::FM::Article-".$ArticleObj->Id."-CustomField-";
 }
 else {

Modified: rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/Preformatted
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/Preformatted	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/Preformatted	Thu Sep 22 15:10:33 2005
@@ -21,18 +21,11 @@
 
 <% $Article->Summary%> 
 
-%my $cfs = $Article->ClassObj->CustomFields;  
+%my $cfs = $Article->CustomFields;  
 % while (my $cf = $cfs->Next) {
-
-%   my $ccf = RT::FM::ClassCustomField->new($session{'CurrentUser'});
-%   $ccf->LoadByCols(Class => $Article->ClassObj->Id, CustomField => $cf->Id);
 %   my $values = $Article->CustomFieldValues($cf->Id);
-%   my $display = $ccf->Display;
-%   if ($display eq "Hidden when empty") {
-%     $display = $values->Count ? "Visible" : "Hidden";
-%   }
-%   next if $display eq "Hidden";
-%   if ($cf->Type eq 'TextSingle') {
+
+%   if ($values->count == 1) {
 %     my $value = $values->First; 
 %     my $content = $value ? $value->Content : "";
 %     if ($content =~ /<(.{1,5})>/) {

Modified: rtfm/branches/2.1-TESTING/lib/RT/FM/Class_Overlay.pm
==============================================================================
--- rtfm/branches/2.1-TESTING/lib/RT/FM/Class_Overlay.pm	(original)
+++ rtfm/branches/2.1-TESTING/lib/RT/FM/Class_Overlay.pm	Thu Sep 22 15:10:33 2005
@@ -188,6 +188,8 @@
 sub ArticleCustomFields {
     my $self = shift;
 
+    $RT::Logger->error("RT::FM::Class->ArticleCustomFields is deprecated  at (". join(":",caller).")");
+
     my $cfs = RT::CustomFields->new( $self->CurrentUser );
     if ( $self->CurrentUserHasRight('SeeClass') ) {
         $cfs->LimitToGlobalOrObjectId( $self->Id );