[ckan-changes] [okfn/ckan] bd9561: [ec] Creation of datasets within joined organizati...

Thu Oct 25 15:34:35 UTC 2012

  Branch: refs/heads/release-v1.7.1-ecportal
  Home:   https://github.com/okfn/ckan
  Commit: bd95619828207744c888cb45c570bd30ff25d4ed
      https://github.com/okfn/ckan/commit/bd95619828207744c888cb45c570bd30ff25d4ed
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M ckan/logic/auth/publisher/create.py

  Log Message:
  -----------
  [ec] Creation of datasets within joined organizations.

  Commit: 31b03e0e6317982ad7e97776e151b859607b3149
      https://github.com/okfn/ckan/commit/31b03e0e6317982ad7e97776e151b859607b3149
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#2784] Hand control of user's sensitive data to user_dictize.

Only a sysadmin or the owner of the account may view a user's apikey
or reset_key.

This does not change behaviour of the actions; just moves the logic
form the actions to the model dictize layer.

Cherry-pick of bd860dc58758356f36518586d1b70e1079700ba2

Conflicts:

	ckan/lib/dictization/model_dictize.py
(cherry picked from commit a3a1f74b5014017835bf0ff911b0a38fdad8d948)

  Commit: dca8a1fd887123b9107941c6bf4ea9e8577445b5
      https://github.com/okfn/ckan/commit/dca8a1fd887123b9107941c6bf4ea9e8577445b5
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/tests/functional/api/test_user.py

  Log Message:
  -----------
  [#2784] Allow users to see their apikey when creating or updating themselves.

Cherrypick of 7fe6c76a5408e41c5693c7ab4b4217e1547f9da4
(cherry picked from commit cb42c5e9e2553e36886926efd75b183c85b002a1)

  Commit: e30ae322f33a8d1a2316889c279d30bb1fcf790b
      https://github.com/okfn/ckan/commit/e30ae322f33a8d1a2316889c279d30bb1fcf790b
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-10-25 (Thu, 25 Oct 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#2784] User email is treated as sensitive data

Cherry-pick of 21ca66c77e9a618cec24709430e73c4409c1ac2c

Conflicts:

	ckan/controllers/user.py
(cherry picked from commit eceb1ea50f1e1cb3db30f6d785938a903818fff9)

Compare: https://github.com/okfn/ckan/compare/05505a5ce3ce...e30ae322f33a