[Bps-public-commit] r14356 - in Prophet/trunk: . lib/Prophet/Server

[sartak at bestpractical.com]

Author: sartak
Date: Tue Jul 22 02:25:52 2008
New Revision: 14356

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/lib/Prophet/Record.pm
   Prophet/trunk/lib/Prophet/Server/View.pm

Log:
 r64706 at onn:  sartak | 2008-07-22 02:20:30 -0400
 Finish the refactor, now we don't display extraneous crap on the display page


Modified: Prophet/trunk/lib/Prophet/Record.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Record.pm	(original)
+++ Prophet/trunk/lib/Prophet/Record.pm	Tue Jul 22 02:25:52 2008
@@ -396,8 +396,9 @@
             $prop = $atom;
         }
 
-        $atom_data{formatted} = $self->format_atom($format => $prop);
         @atom_data{'format', 'prop'} = ($format, $prop);
+        $atom_data{value} = $self->atom_value($prop);
+        $atom_data{formatted} = $self->format_atom($format => $atom_data{value});
 
         push @out, \%atom_data;
     }
@@ -421,14 +422,16 @@
         return $self->uuid;
     } elsif ($value_in eq '$luid') {
         return $self->luid;
+    }
+
     return $value_in;
 }
 
 sub format_atom {
     my $self = shift;
     my $string = shift;
-    my $value_in = shift;
-    return sprintf($string, $self->atom_value($value_in));
+    my $value = shift;
+    return sprintf($string, $self->atom_value($value));
 }
 
 =head2 find_or_create_luid

Modified: Prophet/trunk/lib/Prophet/Server/View.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Server/View.pm	(original)
+++ Prophet/trunk/lib/Prophet/Server/View.pm	Tue Jul 22 02:25:52 2008
@@ -24,7 +24,7 @@
                 for ( sort { $a->luid <=> $b->luid } @items ) {
                     my @atoms = $_->format_summary;
                     row {
-                        cell { $_ } for @atoms;
+                        cell { $_->{value} } for @atoms;
                     }
                 }
             }