Merge pull request #1710 from willimoa/issue/1704

Fix Issue 1709

applications/admin/controllers/appadmin.py

@@ -657,12 +657,11 @@ def d3_graph_model():
     Create a list of table dicts, called "nodes"
     """
     
-    data = {}
     nodes = []
     links = []
 
-    subgraphs = dict()
+    for database in databases:
-
+        db = eval_in_global_env(database)
         for tablename in db.tables:
             fields = []
             for field in db[tablename]:

applications/examples/controllers/appadmin.py

@@ -657,12 +657,11 @@ def d3_graph_model():
     Create a list of table dicts, called "nodes"
     """
     
-    data = {}
     nodes = []
     links = []
 
-    subgraphs = dict()
+    for database in databases:
-
+        db = eval_in_global_env(database)
         for tablename in db.tables:
             fields = []
             for field in db[tablename]:

applications/welcome/controllers/appadmin.py

@@ -657,12 +657,11 @@ def d3_graph_model():
     Create a list of table dicts, called "nodes"
     """
     
-    data = {}
     nodes = []
     links = []
 
-    subgraphs = dict()
+    for database in databases:
-
+        db = eval_in_global_env(database)
         for tablename in db.tables:
             fields = []
             for field in db[tablename]: