diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py index 3c37b19c4ec..33377601839 100644 --- a/ckan/lib/helpers.py +++ b/ckan/lib/helpers.py @@ -692,9 +692,9 @@ def _link_active(kwargs): def _link_active_pylons(kwargs): - highlight_actions = kwargs.get('highlight_actions', - kwargs.get('action', '')).split() - return (c.controller == kwargs.get('controller') + highlight_actions = kwargs.get('highlight_actions', + kwargs.get('action', '')).split() + return (c.controller == kwargs.get('controller') and c.action in highlight_actions) @@ -2550,11 +2550,9 @@ def mail_to(email_address, name): def radio(selected, id, checked): if checked: return literal((u'' - ) % (selected, id, selected, id)) + value="%s" type="radio">') % (selected, id, selected, id)) return literal(('' - ) % (selected, id, selected, id)) + value="%s" type="radio">') % (selected, id, selected, id)) core_helper(flash, name='flash')