pass the toolbox obj to make sure cache is available

galaxyproject · Feb 28, 2018 · e9aad5e · e9aad5e
1 parent e594b2b
commit e9aad5e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/galaxy/tools/toolbox/base.py b/lib/galaxy/tools/toolbox/base.py
@@ -957,7 +957,7 @@ def to_dict(self, trans, in_panel=True, **kwds):
                 if elt.__class__.__name__ == 'Tool':
                     rval.append(self.get_tool_to_dict(trans, elt))
                 else:
-                    kwargs = dict(trans=trans, link_details=True)
+                    kwargs = dict(trans=trans, link_details=True, toolbox=self)
                     rval.append(elt.to_dict(**kwargs))
         else:
             filter_method = self._build_filter_method(trans)

diff --git a/lib/galaxy/tools/toolbox/panel.py b/lib/galaxy/tools/toolbox/panel.py
@@ -69,7 +69,7 @@ def copy(self):
         copy.elems = self.elems.copy()
         return copy
 
-    def to_dict(self, trans, link_details=False):
+    def to_dict(self, trans, link_details=False, toolbox=None):
         """ Return a dict that includes section's attributes. """
 
         section_dict = super(ToolSection, self).to_dict()
@@ -79,8 +79,8 @@ def to_dict(self, trans, link_details=False):
             link_details=link_details
         )
         for elt in self.elems.values():
-            if elt.__class__.__name__ == 'Tool':
-                section_elts.append(trans.app.toolbox.get_tool_to_dict(trans, elt))
+            if elt.__class__.__name__ == 'Tool' and toolbox:
+                section_elts.append(toolbox.get_tool_to_dict(trans, elt))
             else:
                 section_elts.append(elt.to_dict(**kwargs))
         section_dict['elems'] = section_elts