Merge branch 'release_16.01' into dev

galaxyproject · Feb 19, 2016 · 975304a · 975304a
2 parents 5ff028a + b5e91d2
commit 975304a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/galaxy/tools/toolbox/base.py b/lib/galaxy/tools/toolbox/base.py
@@ -176,7 +176,7 @@ def load_item( self, item, tool_path, panel_dict=None, integrated_panel_dict=Non
         elif item_type == 'workflow':
             self._load_workflow_tag_set( item, panel_dict=panel_dict, integrated_panel_dict=integrated_panel_dict, load_panel_dict=load_panel_dict, index=index )
         elif item_type == 'section':
-            self._load_section_tag_set( item, tool_path=tool_path, load_panel_dict=load_panel_dict, index=index )
+            self._load_section_tag_set( item, tool_path=tool_path, load_panel_dict=load_panel_dict, index=index, internal=internal )
         elif item_type == 'label':
             self._load_label_tag_set( item, panel_dict=panel_dict, integrated_panel_dict=integrated_panel_dict, load_panel_dict=load_panel_dict, index=index )
         elif item_type == 'tool_dir':
@@ -652,7 +652,7 @@ def _load_label_tag_set( self, item, panel_dict, integrated_panel_dict, load_pan
             panel_dict[ key ] = label
         integrated_panel_dict.update_or_append( index, key, label )
 
-    def _load_section_tag_set( self, item, tool_path, load_panel_dict, index=None ):
+    def _load_section_tag_set( self, item, tool_path, load_panel_dict, index=None, internal=False ):
         key = item.get( "id" )
         if key in self._tool_panel:
             section = self._tool_panel[ key ]
@@ -675,7 +675,7 @@ def _load_section_tag_set( self, item, tool_path, load_panel_dict, index=None ):
                 load_panel_dict=load_panel_dict,
                 guid=sub_item.get( 'guid' ),
                 index=sub_index,
-                internal=True,
+                internal=internal,
             )
 
         # Ensure each tool's section is stored

diff --git a/lib/galaxy/util/__init__.py b/lib/galaxy/util/__init__.py
@@ -361,7 +361,11 @@ def pretty_print_time_interval( time=False, precise=False ):
     elif isinstance( time, datetime ):
         diff = now - time
     elif isinstance( time, string_types ):
-        time = datetime.strptime( time, "%Y-%m-%dT%H:%M:%S.%f" )
+        try:
+            time = datetime.strptime( time, "%Y-%m-%dT%H:%M:%S.%f" )
+        except ValueError:
+            # MySQL may not support microseconds precision
+            time = datetime.strptime( time, "%Y-%m-%dT%H:%M:%S" )
         diff = now - time
     else:
         diff = now - now