[virtualcommons-developer] commit/vcweb: alllee: fixing bugs in GroupRelationship / GroupCluster creation

[<com...@bi...>]

1 new commit in vcweb:

https://bitbucket.org/virtualcommons/vcweb/commits/c8198aae5658/
Changeset:   c8198aae5658
User:        alllee
Date:        2013-03-22 23:16:38
Summary:     fixing bugs in GroupRelationship / GroupCluster creation
Affected #:  1 file

diff -r 382e0877518b5f426e9ca3f8959df4c223266160 -r c8198aae5658342c84413233ce304daeedf8f077 vcweb/core/models.py
--- a/vcweb/core/models.py
+++ b/vcweb/core/models.py
@@ -735,11 +735,11 @@
                         group_cluster_size, len(groups))
                 return
             random.shuffle(groups)
-            g = GroupCluster.objects.create(session_id=session_id, experiment=self)
+            gc = GroupCluster.objects.create(session_id=session_id, experiment=self)
             for group in groups:
-                if g.group_set.count() == group_cluster_size:
-                    g = GroupCluster.objects.create(session_id=session_id, experiment=self)
-                g.group_set.add(group)
+                if gc.group_relationship_set.count() == group_cluster_size:
+                    gc = GroupCluster.objects.create(session_id=session_id, experiment=self)
+                gc.add(group)
 
     def get_round_configuration(self, sequence_number):
         return RoundConfiguration.objects.get(experiment_configuration__experiment=self, sequence_number=sequence_number)
@@ -1538,6 +1538,9 @@
     session_id = models.CharField(max_length=64, null=True, blank=True)
     experiment = models.ForeignKey(Experiment)
 
+    def add(self, group):
+        return GroupRelationship.objects.create(cluster=self, group=group)
+
     def __unicode__(self):
         return u"group cluster %s (%s)" % (self.name, self.experiment)
 
@@ -1546,7 +1549,7 @@
 
 class GroupRelationship(models.Model):
     date_created = models.DateTimeField(default=datetime.now)
-    cluster = models.ForeignKey(GroupCluster, related_name='group_set')
+    cluster = models.ForeignKey(GroupCluster, related_name='group_relationship_set')
     group = models.ForeignKey(Group)
 
     def __unicode__(self):

Repository URL: https://bitbucket.org/virtualcommons/vcweb/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.