[PATCH 02/14] CIMI (schema): properly generate and track embedded collection classes

[lutter]

From: David Lutterkort <lut...@redhat.com>

---
 server/lib/cimi/models/schema.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/lib/cimi/models/schema.rb b/server/lib/cimi/models/schema.rb
index b4e9377..9c27c6f 100644
--- a/server/lib/cimi/models/schema.rb
+++ b/server/lib/cimi/models/schema.rb
@@ -302,7 +302,10 @@ class CIMI::Model::Schema
         raise "Specify the class of collection entries using :class"
       end
       params[:embedded] = true
-      @collection_class = CIMI::Model::Collection.generate(opts[:class], 
params)
+      unless opts[:class].collection_class
+        opts[:class].collection_class = 
CIMI::Model::Collection.generate(opts[:class], params)
+      end
+      @collection_class = opts[:class].collection_class
     end
 
     def from_xml(xml, model)
@@ -466,7 +469,7 @@ class CIMI::Model::Schema
     end
 
     def collection(name, opts={})
-      opts[:scope] = self.class
+      opts[:scope] = self
       add_attributes!([name, opts], Collection)
     end
   end
-- 
1.8.1.4