Pass dbstate, rather thandb, into populate_model

Author: stevenyoungs

Form/UK1841.py

@@ -54,7 +54,8 @@ def __init__(self):
         ActionBase.__init__(self)
         pass
 
-    def populate_model(self, db, citation, form_event, model):
+    def populate_model(self, dbstate, citation, form_event, model):
+        db = dbstate.db
         parent = model.append(None, (_("Add Primary Name citation"), None, None))
         for item in db.find_backlink_handles(form_event.get_handle(),
                                              include_classes=['Person']):
@@ -79,7 +80,8 @@ def __init__(self):
         ActionBase.__init__(self)
         pass
 
-    def populate_model(self, db, citation, form_event, model):
+    def populate_model(self, dbstate, citation, form_event, model):
+        db = dbstate.db
         # if there is no date on the form, no actions can be performed
         if form_event.get_date_object():
             parent = model.append(None, (_("Add Birth event"), None, None))
@@ -117,7 +119,8 @@ def __init__(self):
         ActionBase.__init__(self)
         pass
 
-    def populate_model(self, db, citation, form_event, model):
+    def populate_model(self, dbstate, citation, form_event, model):
+        db = dbstate.db
         parent = model.append(None, (_("Add Occupation event"), None, None))
         for item in db.find_backlink_handles(form_event.get_handle(),
                                              include_classes=['Person']):

Form/formactions.py

@@ -149,7 +149,7 @@ def _populate_model(self):
 
             for action_class in action_classes:
                 action = (action_class[1])()
-                action.populate_model(self.db, self.citation, self.event, self.model)
+                action.populate_model(self.dbstate, self.citation, self.event, self.model)
 
     def run(self):
         """