[ckan-changes] [ckan/ckan] 693eb2: Use the full organization dict to display orgs

[GitHub]

  Branch: refs/heads/release-v2.1.3
  Home:   https://github.com/ckan/ckan
  Commit: 693eb23e893e8a72b6011bb37e3889fa9ccb84b6
      https://github.com/ckan/ckan/commit/693eb23e893e8a72b6011bb37e3889fa9ccb84b6
  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: bba47483630c4b27b1263f9e4b31ba1508e37c7c
      https://github.com/ckan/ckan/commit/bba47483630c4b27b1263f9e4b31ba1508e37c7c
  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/bcb3b1fdec56...bba47483630c