[ckan-changes] [okfn/ckan] abb731: [1720][dictization] unflatten update - handle case...

[GitHub]

  Branch: refs/heads/feature-1653-i18n_url_rewriting
  Home:   https://github.com/okfn/ckan
  Commit: abb7317597a1c9bd8acf2be46c9a031141edc5b2
      https://github.com/okfn/ckan/commit/abb7317597a1c9bd8acf2be46c9a031141edc5b2
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py

  Log Message:
  -----------
  [1720][dictization] unflatten update - handle case where data already contains an unflattened list (eg: of extras)


  Commit: c5a90d841c448a90e16701f7a6d37e5db31ca501
      https://github.com/okfn/ckan/commit/c5a90d841c448a90e16701f7a6d37e5db31ca501
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  M ckan/logic/converters.py
  M ckan/logic/schema.py
  M ckan/model/tag.py
  M ckan/model/vocabulary.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_tag_vocab.py

  Log Message:
  -----------
  Merge branch 'feature-1698-tag-taxonomies'


  Commit: 309e3609696ff68facb7fe61ededbbc50f9b64ed
      https://github.com/okfn/ckan/commit/309e3609696ff68facb7fe61ededbbc50f9b64ed
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  M ckan/logic/converters.py
  M ckan/logic/schema.py
  M ckan/model/tag.py
  M ckan/model/vocabulary.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_tag_vocab.py

  Log Message:
  -----------
  Merge branch 'master' into feature-1653-i18n_url_rewriting


Compare: https://github.com/okfn/ckan/compare/5886a53...309e360