[ckan-changes] [okfn/ckan] f366ba: [#1188] Allow organization dropdown to be displaye...

Wed Jan 8 16:55:38 UTC 2014

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: f366ba684340adbb903b78bc5beb871069a6a0c2
      https://github.com/okfn/ckan/commit/f366ba684340adbb903b78bc5beb871069a6a0c2
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  [#1188] Allow organization dropdown to be displayed

The current logic was unclear. If a user belongs to at least one
organization, the dropdown will be displayed, both on the created and
edit forms. Same for the visibility one.

  Commit: 62fba1241be09e7ff6bd197a79e0c8258a00b357
      https://github.com/okfn/ckan/commit/62fba1241be09e7ff6bd197a79e0c8258a00b357
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1188] Allow empty orgs if datasets can be unowned

If the "create_unowned_dataset" is set to True and you are not a
sysadmin and select the "No organization" option on the dataset form,
you get a validation error.

  Commit: fc20a45ffff312061b13ebaf00ba71c455ad69d5
      https://github.com/okfn/ckan/commit/fc20a45ffff312061b13ebaf00ba71c455ad69d5
  Author: amercader <amercadero at gmail.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    R ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/README.txt
    M ckan/config/solr/schema-1.2.xml
    M ckan/config/solr/schema-1.3.xml
    M ckan/config/solr/schema-1.4.xml
    M ckan/config/solr/schema-2.0.xml
    A ckan/config/solr/schema.xml
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/accept.py
    M ckan/lib/cli.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/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.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/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/group.py
    M ckan/new_authz.py
    M ckan/new_tests/factories.py
    A ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/image-upload.js
    A ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/search.less
    A ckan/public/base/vendor/jquery.ui.core.js
    A ckan/public/base/vendor/jquery.ui.mouse.js
    A ckan/public/base/vendor/jquery.ui.sortable.js
    M ckan/public/base/vendor/jquery.ui.widget.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    M ckan/templates/base.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/activity.html
    R ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    A ckan/templates/package/group_list.html
    M ckan/templates/package/new.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/search_result_text.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read.html
    M ckan/templates/user/read_base.html
    R ckan/templates/user/snippets/back_to_user_action.html
    M ckan/templates/user/snippets/login_form.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_schema_version.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/models/test_group.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M doc/appendices/solr-multicore.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/contents.rst
    M doc/documentation-guidelines.rst
    M doc/filestore.rst
    M doc/install-from-source.rst
    M doc/release-process.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 1188-fix-org-list-dataset-form

  Commit: 10a379881fb6784014265c6e7371de434c3c8898
      https://github.com/okfn/ckan/commit/10a379881fb6784014265c6e7371de434c3c8898
  Author: amercader <amercadero at gmail.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

  Changed paths:
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  Revert "[#1188] Allow organization dropdown to be displayed"

There is certain logic, albeit a bit flacky, in hiding the organization
dropwdown, in that if shown, any user belonging to an organization could
take ownership of any unowned dataset in the instance. We need to
properly define the auth rules and enforce them at the validator level
as well. For the time being, showing the dropdown only to sysadmins
makes sense (and of course fixing the original bug on the visibility
field validator, which is done on the next commit)

This reverts commit f366ba684340adbb903b78bc5beb871069a6a0c2.

  Commit: 864e1a68c8183b35cb2e7fcb0db43b51d1f6cc58
      https://github.com/okfn/ckan/commit/864e1a68c8183b35cb2e7fcb0db43b51d1f6cc58
  Author: amercader <amercadero at gmail.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

  Changed paths:
    M ckan/logic/validators.py
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1188] Fix visibility validator

To not rely on owner_org being present, when the validator gets a value
of private and there is no owner_org, we request the dataset anyway and
check if it actually has an owner_org.

Added new validation tests

  Commit: 42e17b5edd5799f0b876e848ec44b7aae816a4c1
      https://github.com/okfn/ckan/commit/42e17b5edd5799f0b876e848ec44b7aae816a4c1
  Author: amercader <amercadero at gmail.com>
  Date:   2013-12-12 (Thu, 12 Dec 2013)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1188] Remove debugger call

  Commit: 2570f454b9dcd30af80ef627557874dbf1c43e46
      https://github.com/okfn/ckan/commit/2570f454b9dcd30af80ef627557874dbf1c43e46
  Author: amercader <amercadero at gmail.com>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1188] PEP8 fixes

  Commit: 39662c35a1ab89a35e7d73bb0d129a42ac0d3e80
      https://github.com/okfn/ckan/commit/39662c35a1ab89a35e7d73bb0d129a42ac0d3e80
  Author: amercader <amercadero at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1188] Tweak checks to support empty strings

  Commit: 4bddcd8fe211270f664331b08b676dbc1fa99d9e
      https://github.com/okfn/ckan/commit/4bddcd8fe211270f664331b08b676dbc1fa99d9e
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-01-08 (Wed, 08 Jan 2014)

  Changed paths:
    M ckan/logic/validators.py
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  Merge branch '1188-fix-org-list-dataset-form'

Compare: https://github.com/okfn/ckan/compare/d696e975e7cd...4bddcd8fe211