[ckan-changes] [okfn/ckan] 91e9a2: [#1608, bugfix][xs]: minor, but important bugfix fo...

[GitHub]

  Branch: refs/heads/feature-1698-tag-taxonomies
  Home:   https://github.com/okfn/ckan
  Commit: 91e9a2d44ad4c33f5cac6626ea49609401c94637
      https://github.com/okfn/ckan/commit/91e9a2d44ad4c33f5cac6626ea49609401c94637
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1608,bugfix][xs]: minor, but important bugfix for blob storage.

* Bug: we had merged ckanext-storage into core as part of #1608 but the JS was checking CKAN.Plugins list in javascript (build from ckan.plugins in config) when determining whether to show Upload button. Thus new users would not have known how to enable uploading.
* Fixed this by adding 'storage' to CKAN.Plugins in JS if ckan.storage.bucket config option is set.


  Commit: d59cd9c9d9fa406b6cec091d1699f0a7c62a9d50
      https://github.com/okfn/ckan/commit/d59cd9c9d9fa406b6cec091d1699f0a7c62a9d50
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/templates/package/edit.html
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [bugfix,js][xs]: make sure we do *not* genshi HTML escape json package and resource data we are inserting into pages (dataset edit and resource read).

* Had run into this via an odd bug whereby a resource url that was an html page was not previewing and reason was & had been converted to &


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

  Changed paths:
    M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/resource_read.html

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


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

  Changed paths:
    M ckan/lib/search/query.py
  M ckan/model/package.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/lib/test_solr_package_search.py

  Log Message:
  -----------
  [#1698] Fix some failing psql tests


  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).


Compare: https://github.com/okfn/ckan/compare/22a2ea2...b24205b