[ckan-changes] [ckan/ckan] 3de3ba: [#2044] Fix datastore docs link

[GitHub]

  Branch: refs/heads/release-v2.0.6
  Home:   https://github.com/ckan/ckan
  Commit: 3de3ba7fba964d739b6552c6c3d29dace5cd88d1
      https://github.com/ckan/ckan/commit/3de3ba7fba964d739b6552c6c3d29dace5cd88d1
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M ckan/templates/ajax_snippets/api_info.html

  Log Message:
  -----------
  [#2044] Fix datastore docs link


  Commit: 6b6fe7a7672ba98b4d718b611baa8aaf01e79dcc
      https://github.com/ckan/ckan/commit/6b6fe7a7672ba98b4d718b611baa8aaf01e79dcc
  Author: amercader <amercadero at gmail.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  [#2158] Replace all resource extras on update so they don't get lost

Resource `extras` were being ignored on `resource_udpate`. The rest of
the resource field got updated but no the extras.

The resource `extras` field is using a custom `JsonDictType`, and
according to SQLAlchemy documentation:

> Note that the ORM by default will not detect “mutability” on such a
> type - meaning, in-place changes to values will not be detected and
> will not be flushed. Without further steps, you instead would need to
> replace the existing value with a new one on each parent object to
> detect changes.

Replacing `obj.extras` with a new dict solves the issue

http://docs.sqlalchemy.org/en/rel_0_9/core/custom_types.html#marshal-json-strings

Conflicts:
	ckan/lib/dictization/model_save.py


Compare: https://github.com/ckan/ckan/compare/6510847c4964...6b6fe7a7672b