[ckan-changes] [ckan/ckan] 3e59a8: Use the full organization dict to display orgs

[GitHub]

  Branch: refs/heads/release-v2.2.1
  Home:   https://github.com/ckan/ckan
  Commit: 3e59a887b77ed854c4e4663b115a3fa250a8ed14
      https://github.com/ckan/ckan/commit/3e59a887b77ed854c4e4663b115a3fa250a8ed14
  Author: Nigel Babu <nigel.babu at okfn.org>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/package/read_base.html

  Log Message:
  -----------
  Use the full organization dict to display orgs

The package page uses only the bits of the organization dict that is returned
from package_show, this doesn't have the image_display_url and therefore
organization images are not shown anymore. This uses a new helper to get the
full organization dict.

Conflicts:
	ckan/lib/helpers.py


  Commit: 6a5e32407260fcd552a0a6901ec4c38e441bef37
      https://github.com/ckan/ckan/commit/6a5e32407260fcd552a0a6901ec4c38e441bef37
  Author: nigelb <nigel.babu at okfn.org>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Catch NotFound, ValidationError, and NotAuthorized


Compare: https://github.com/ckan/ckan/compare/f23362980d3b...6a5e32407260