py3: fix published workflows grid

galaxyproject · Jul 5, 2018 · ea44034 · ea44034
1 parent 09e39e9
commit ea44034
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/galaxy/web/framework/helpers/grids.py b/lib/galaxy/web/framework/helpers/grids.py
@@ -579,6 +579,8 @@ def get_value(self, trans, grid, item):
         else:
             ave_item_rating = item.average_rating
             num_ratings = 2  # just used for pluralization
+        if not ave_item_rating:
+            ave_item_rating = 0
         return trans.fill_template("tool_shed_rating.mako",
                                    ave_item_rating=ave_item_rating,
                                    num_ratings=num_ratings,

diff --git a/templates/tagging_common.mako b/templates/tagging_common.mako
@@ -2,9 +2,10 @@
     from cgi import escape
     from random import random
     from math import floor
+    import six
     from galaxy.model import Tag, ItemTagAssociation
     from galaxy.web.framework.helpers import iff
-    import six
+    from galaxy.util import unicodify
 %>
 
 ## Render a tagging element if there is a tagged_item.
@@ -53,9 +54,9 @@
 
                     ## Convert tag name, value to unicode.
                     if isinstance( tag_name, str ):
-                        tag_name = unicode( escape( tag_name ), 'utf-8' )
+                        tag_name = unicodify( escape( tag_name ) )
                         if tag_value:
-                            tag_value = unicode( escape( tag_value ), 'utf-8' )
+                            tag_value = unicodify( escape( tag_value ) )
                     if tag_value:
                         tag_str = tag_name + ":" + tag_value
                     else: