[svn:p5ee] r7947 - p5ee/trunk/App-Widget/lib/App/Widget

[spadkins]

Author: spadkins
Date: Mon Oct 16 11:04:25 2006
New Revision: 7947

Modified:
   p5ee/trunk/App-Widget/lib/App/Widget/Graph.pm

Log:
fix the way Graphs get their data from object_sets

Modified: p5ee/trunk/App-Widget/lib/App/Widget/Graph.pm
==============================================================================
--- p5ee/trunk/App-Widget/lib/App/Widget/Graph.pm       (original)
+++ p5ee/trunk/App-Widget/lib/App/Widget/Graph.pm       Mon Oct 16 11:04:25 2006
@@ -120,10 +120,15 @@
     $spec = $self if (!$spec);
     my $name = $self->{name};
     my $context = $self->{context};
-    my $object_set_name = $spec->{object_set} || "$name-object_set";
-    my ($object_set);
-    if ($object_set_name) {
-        $object_set = $context->session_object($object_set_name, class => 
"App::SessionObject::RepositoryObjectSet");
+
+    #my $object_set_name = $spec->{object_set} || "$name-object_set";
+    my $object_set = $spec->{object_set};
+
+    if (!$object_set) {
+        $object_set = $context->session_object("$name-object_set");
+    }
+    elsif (! ref $object_set) {
+        $object_set = $context->session_object($object_set, class => 
"App::SessionObject::RepositoryObjectSet");
     }
     elsif ($spec->{domain}) {
         my $domain_name = $spec->{domain};