[ckan-changes] [okfn/ckan] dff9f7: Merge branch 'feature-1698-tag-taxonomies'

[GitHub]

  Branch: refs/heads/feature-1698-tag-taxonomies
  Home:   https://github.com/okfn/ckan
  Commit: dff9f7a8bdd0c15640f9a9029ab8d2beec4fedaa
      https://github.com/okfn/ckan/commit/dff9f7a8bdd0c15640f9a9029ab8d2beec4fedaa
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/controllers/api.py
  M ckan/controllers/package.py
  M ckan/forms/common.py
  M ckan/forms/package_dict.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/search/query.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  M ckan/logic/auth/publisher/create.py
  M ckan/logic/auth/publisher/delete.py
  M ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  M ckan/logic/converters.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  A ckan/migration/versions/051_add_tag_vocabulary.py
  M ckan/model/__init__.py
  M ckan/model/package.py
  M ckan/model/tag.py
  A ckan/model/vocabulary.py
  M ckan/templates/_util.html
  M ckan/templates/package/new_package_form.html
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/api/model/test_package.py
  A ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_package.py
  A ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/logic/test_action.py
  A ckan/tests/logic/test_tag_vocab.py
  M ckan/tests/models/test_package.py
  M ckan/tests/models/test_purge_revision.py

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


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

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_tag_vocab.py

  Log Message:
  -----------
  Tweak vocabulary_show() arguments

Be consistent with other *_show() logic functions: accept an 'id'
argument that can be either the vocab ID or the name.


  Commit: 0e892f8cbfbc95d0754a9bd781586fd46053bd3b
      https://github.com/okfn/ckan/commit/0e892f8cbfbc95d0754a9bd781586fd46053bd3b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/logic/action/delete.py
  M ckan/logic/action/update.py

  Log Message:
  -----------
  Tweak vocab API error messages

Make them all use the same string, easier to translate


  Commit: 05f1273389b0ba8ef94dd4a461ef082631fd8378
      https://github.com/okfn/ckan/commit/05f1273389b0ba8ef94dd4a461ef082631fd8378
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/logic/action/update.py
  M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  Fix vocabulary_update() when no id given


  Commit: 9e6872aa80adc911d4e17a28c862e2956db6c506
      https://github.com/okfn/ckan/commit/9e6872aa80adc911d4e17a28c862e2956db6c506
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/logic/action/delete.py
  M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  Fix vocabulary_delete() when no id given


  Commit: 8b20b91da9e238fd7142d4a120ac87d591c9d1b7
      https://github.com/okfn/ckan/commit/8b20b91da9e238fd7142d4a120ac87d591c9d1b7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/logic/action/delete.py
  M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  Tweak tag_delete() error messages

Make them more consistent with those of other logic functions


  Commit: 277dc15a60bdd9f9355b3b7614cd87f07eb57806
      https://github.com/okfn/ckan/commit/277dc15a60bdd9f9355b3b7614cd87f07eb57806
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/logic/action/update.py

  Log Message:
  -----------
  Remove some unnecessary lines of code


  Commit: 5abbd17ebaf0fe165d8598ffa41e7ca4832d8e10
      https://github.com/okfn/ckan/commit/5abbd17ebaf0fe165d8598ffa41e7ca4832d8e10
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M ckan/tests/functional/test_tag_vocab.py

  Log Message:
  -----------
  [#1698] Add failing vocabs wui test


Compare: https://github.com/okfn/ckan/compare/5a5f787...5abbd17