diff --git a/ckan/controllers/group.py b/ckan/controllers/group.py index 6fc09a0036a..71918e6e5cc 100644 --- a/ckan/controllers/group.py +++ b/ckan/controllers/group.py @@ -83,21 +83,16 @@ def read(self, id): except NotAuthorized: abort(401, _('Unauthorized to read group %s') % id) try: - description_formatted = ckan.misc.MarkdownFormat().to_html(c.group.get('description','')) + description_formatted = ckan.misc.MarkdownFormat().to_html(c.group_dict.get('description','')) c.description_formatted = genshi.HTML(description_formatted) except Exception, e: error_msg = "%s" % _("Cannot render description") c.description_formatted = genshi.HTML(error_msg) - try: - desc_formatted = ckan.misc.MarkdownFormat().to_html(c.group.description) - desc_formatted = genshi.HTML(desc_formatted) - except genshi.ParseError, e: - desc_formatted = 'Error: Could not parse group description' - c.group_description_formatted = desc_formatted c.group_admins = self.authorizer.get_admins(c.group) context['return_query'] = True + results = get_action('group_package_show')(context, data_dict) c.page = Page( diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html index 47ca43c080a..d6679afbd3d 100644 --- a/ckan/templates/group/read.html +++ b/ckan/templates/group/read.html @@ -24,8 +24,8 @@

Administrators

State: ${c.group['state']}

-
- ${c.group_description_formatted} +
+ ${c.description_formatted}

Datasets