[Jifty-commit] r2786 - in jifty/branches/virtual-models: . t/TestApp-DatabaseBackedModels/t

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Sat Feb 10 22:26:44 2007
New Revision: 2786

Modified:
   jifty/branches/virtual-models/   (props changed)
   jifty/branches/virtual-models/lib/Jifty/Script/Database.pm
   jifty/branches/virtual-models/t/TestApp-DatabaseBackedModels/t/01-insert.t
   jifty/branches/virtual-models/t/TestApp-DatabaseBackedModels/t/upgrades.t

Log:
 r21986 at hualien:  jesse | 2007-02-10 22:26:17 -0500
 * more haxxoring on versioned models


Modified: jifty/branches/virtual-models/lib/Jifty/Script/Database.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Script/Database.pm	(original)
+++ jifty/branches/virtual-models/lib/Jifty/Script/Database.pm	Sat Feb 10 22:26:44 2007
@@ -54,12 +54,6 @@
     $self->_load_data($content);
 }
 
-sub _load_data {
-    my $self = shift;
-    my $content = shift;
-
-    $self->_load_data($content);
-}
 
 sub _load_data {
     my $self = shift;

Modified: jifty/branches/virtual-models/t/TestApp-DatabaseBackedModels/t/01-insert.t
==============================================================================
--- jifty/branches/virtual-models/t/TestApp-DatabaseBackedModels/t/01-insert.t	(original)
+++ jifty/branches/virtual-models/t/TestApp-DatabaseBackedModels/t/01-insert.t	Sat Feb 10 22:26:44 2007
@@ -31,7 +31,7 @@
 $col->create(name => 'name', 
             model_class => $model,
             storage_type => 'text',
-            label => 'Object name',
+            label_text => 'Object name',
             hints => q{What's it called, yo?});
 
 ok($col->id);
@@ -39,7 +39,7 @@
 $col2->create(name => 'inventory', 
             model_class => $model,
             storage_type => 'int',
-            label => 'Volume on hand',
+            label_text => 'Volume on hand',
             hints => q{How many you gots?});
 
 ok($col2->id, "Got column ".$col2->id);

Modified: jifty/branches/virtual-models/t/TestApp-DatabaseBackedModels/t/upgrades.t
==============================================================================
--- jifty/branches/virtual-models/t/TestApp-DatabaseBackedModels/t/upgrades.t	(original)
+++ jifty/branches/virtual-models/t/TestApp-DatabaseBackedModels/t/upgrades.t	Sat Feb 10 22:26:44 2007
@@ -31,7 +31,7 @@
 $col->create(name => 'name', 
             model_class => $model,
             storage_type => 'text',
-            label => 'Object name',
+            label_text => 'Object name',
             hints => q{What's it called, yo?});
 
 ok($col->id);
@@ -39,7 +39,7 @@
 $col2->create(name => 'inventory', 
             model_class => $model,
             storage_type => 'int',
-            label => 'Volume on hand',
+            label_text => 'Volume on hand',
             hints => q{How many you gots?});
 
 ok($col2->id, "Got column ".$col2->id);