[ckan-changes] [okfn/ckan] fddf54: Merge branch 'master' of https://github.com/okfn/c...

Mon Sep 3 08:01:15 UTC 2012

  Branch: refs/heads/organizations-in-core
  Home:   https://github.com/okfn/ckan
  Commit: fddf54517b400ac306718c7b29cc96effcaee350
      https://github.com/okfn/ckan/commit/fddf54517b400ac306718c7b29cc96effcaee350
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/authorization_group.py
    M ckan/forms/__init__.py
    M ckan/forms/authorization_group.py
    M ckan/forms/authz.py
    M ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/model/__init__.py
    R ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/plugins/interfaces.py
    R ckan/public/images/icons/authorization_group.png
    R ckan/public/images/icons/authorization_group_add.png
    R ckan/public/images/icons/authorization_group_edit.png
    A ckan/public/images/icons/followers.png
    M ckan/public/scripts/application.js
    M ckan/templates/_util.html
    M ckan/templates/admin/authz.html
    R ckan/templates/authorization_group/__init__.py
    R ckan/templates/authorization_group/authz.html
    R ckan/templates/authorization_group/edit.html
    R ckan/templates/authorization_group/edit_form.html
    R ckan/templates/authorization_group/index.html
    R ckan/templates/authorization_group/layout.html
    R ckan/templates/authorization_group/new.html
    R ckan/templates/authorization_group/read.html
    M ckan/templates/group/authz.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/user/layout.html
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/functional/api/test_authorization_group.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authorization_group.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/test_authz.py

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan

  Commit: caa1700a08a9077c8a3f89fa03478ee8c971445b
      https://github.com/okfn/ckan/commit/caa1700a08a9077c8a3f89fa03478ee8c971445b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/api.py
    A ckan/controllers/organization.py
    M ckan/lib/dictization/model_dictize.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/__init__.py
    M ckan/logic/auth/publisher/__init__.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/publisher/get.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/public/scripts/application.js
    M ckan/templates/_util.html
    M ckan/templates/js_strings.html
    A ckan/templates/organization/__init__.py
    A ckan/templates/organization/apply.html
    A ckan/templates/organization/apply_form.html
    A ckan/templates/organization/edit.html
    A ckan/templates/organization/email/join_publisher_request.txt
    A ckan/templates/organization/history.html
    A ckan/templates/organization/index.html
    A ckan/templates/organization/layout.html
    A ckan/templates/organization/new.html
    A ckan/templates/organization/organization_form.html
    A ckan/templates/organization/read.html
    A ckan/templates/organization/users.html
    A ckan/templates/organization/users_form.html
    R ckan/tests/misc/test_auth_profiles.py

  Log Message:
  -----------
  Create organizations as their own distinct entity (using same model).

To remove the complexity and confusion around using IGroupForm to hide away the
fact that an Organization is a group, in so much as it uses the same model, I have
moved Organization into its own Controller and set of action methods.

- Added controllers/organization so that the Group and Organization controllers can
  diverge without a tangle of conditionals.  Organization already has two actions that
  are irrelevant to groups.
- Added templates specifically for organizations, and made sure that it used the
  organization rather than group within those templates.
- Added routes to the new controller
- Added auth+action methods to handle organization_create etc.
- Added an autocomplete for organizations both in the API and in the JS

Compare: https://github.com/okfn/ckan/compare/fddf54517b40^...caa1700a08a9