[ckan-changes] [okfn/ckan] b24205: [#1698] Tag and vocab logic functions tweaks

[GitHub]

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

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

  Log Message:
  -----------
  [#1698] Tag and vocab logic functions tweaks

Fix tag_list() and Tag.all() to handle both the optional query and
vocabulary_id correctly, and change 'vocabulary_name' arguments in tag
and vocab logic functions to 'vocabulary_id' arguments that can be
either name or ID (to be consistent with other logic functions).


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

  Changed paths:
    M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  R ckan/migration/versions/050_add_tag_vocabulary.py
  A ckan/migration/versions/050_term_translation_table.py
  A ckan/migration/versions/051_add_tag_vocabulary.py
  M ckan/model/__init__.py
  A ckan/model/term_translation.py
  M ckan/plugins/interfaces.py
  M ckan/templates/package/read.html
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1698-tag-taxonomies

Conflicts:
	ckan/logic/auth/update.py


  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'


Compare: https://github.com/okfn/ckan/compare/7825cae...dff9f7a