[ckan-changes] [okfn/ckan] 5809fa: [#409] Remove authz admin functionality from contr...
GitHub
noreply at github.com
Wed Feb 20 17:16:56 UTC 2013
Branch: refs/heads/262-improve-helper-imports
Home: https://github.com/okfn/ckan
Commit: 5809fa061ebbdf6102e39f58badfabe1405203c3
https://github.com/okfn/ckan/commit/5809fa061ebbdf6102e39f58badfabe1405203c3
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/controllers/admin.py
Log Message:
-----------
[#409] Remove authz admin functionality from controller
Commit: 313b1b3794d9d8bac0c7753b27fb444f30fdd89a
https://github.com/okfn/ckan/commit/313b1b3794d9d8bac0c7753b27fb444f30fdd89a
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
R ckan/templates/admin/authz.html
Log Message:
-----------
[#409] Remove authz admin template
Commit: f2ff8ca9d236c67ac1dd95bbb2cfae97ce86878c
https://github.com/okfn/ckan/commit/f2ff8ca9d236c67ac1dd95bbb2cfae97ce86878c
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/templates/admin/snippets/header.html
Log Message:
-----------
[#409] Remove authz admin from menu
Commit: 61aacc8f106b13e65f48a1759e9aded019359555
https://github.com/okfn/ckan/commit/61aacc8f106b13e65f48a1759e9aded019359555
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/config/routing.py
R ckan/controllers/datastore.py
R ckan/tests/functional/test_datastore.py
Log Message:
-----------
[#362][s]: remove controller, routing and test code related to old (ES) datastore.
Note, have not removed (and will not remove) references to old datastore in:
* templates_legacy (assume these will get removed anyway)
* i18n (assume this will get rebuilt prior to release)
Commit: 27361b88e1b8fe2167f83bd9cb5cf70e953ce052
https://github.com/okfn/ckan/commit/27361b88e1b8fe2167f83bd9cb5cf70e953ce052
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/controllers/package.py
R ckan/templates/package/resource_api_data.html
M ckan/templates/package/snippets/data_api_button.html
Log Message:
-----------
[#362,bugfix][s]: remove remaining reference to routing for old datastore (by removing api_data method in package controller).
The ultimate change was reasonably substantial - removal of an entire method on
a controller and associated template. It began simply with the need to
remove/update reference this routing call in api_data method on package
controller
url = h.url_for('datastore_read', id=id, qualified=True)
I spent about half an hour trying to understand if this method was used at all.
I ultimately determined that we had a setup where clicking on the Data API
button in the resource view had 2 possible effect routes:
* Via href={url} => package.py/api_data method =>
template/package/resource_api_data.html =>
template/ajax_snippets/api_info.html
* Via JS intercept of click => api/snippets controller =>
template/ajax_snippets/api_info.html
But there was a subtle difference: the first route (which is *not* normally
followed since JS is usally enabled) still uses the old datastore URL (this is
why I'd started this investigation!).
(Aside: this was hard to debug through the interface as JS is enabled and I
note we do not have resource view tests so the non AJAX route is not tested).
I first tried to correct this by setting the URL to the correct datastore API
but then discovered other parameters were missing - it seems the signature of
the call to ajax_snippets template has changed but that the relevant code in
package/resource_data_api.html has not been updated:
{% snippet 'ajax_snippets/api_info.html', datastore_root_url=datastore_root_url, embedded=true %}
Rather than continue fixing I decided at this point to remove this non-AJAX
fallback code in its entirety.
Comment: this was a subtle bug that has crept in because there are now 2 ways to do
something and one of these routes (the non-AJAX route) is almost never used ...
I wonder whether it is necessary always to have both options (AJAX and
non-AJAX) as it likely to multiply code complexity and, hence, these sort of bugs.
Commit: e8eb4ad76b0d016d5d8c6431098376fc33507504
https://github.com/okfn/ckan/commit/e8eb4ad76b0d016d5d8c6431098376fc33507504
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/templates/package/snippets/data_api_button.html
Log Message:
-----------
[#362] Fix api info for non-js browsing
Commit: 0fe757949f244ab935e49c619f2603e16659e29b
https://github.com/okfn/ckan/commit/0fe757949f244ab935e49c619f2603e16659e29b
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/templates/package/snippets/data_api_button.html
Log Message:
-----------
[#362] Fix broken test code
Commit: de894c0ea8e1c5ad0a23b7150760296bd57c15a1
https://github.com/okfn/ckan/commit/de894c0ea8e1c5ad0a23b7150760296bd57c15a1
Author: amercader <amercadero at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/templates/package/snippets/data_api_button.html
Log Message:
-----------
[#362] Fix datastore active check and misleading message
Commit: 5aab872c4925d807ad549c3e36af585e2ce73c54
https://github.com/okfn/ckan/commit/5aab872c4925d807ad549c3e36af585e2ce73c54
Author: John Martin <me at johnmart.in>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/admin.py
R ckan/templates/admin/authz.html
M ckan/templates/admin/snippets/header.html
Log Message:
-----------
Merge pull request #409 from okfn/409-kill-old-admin
Remove old auth page
Commit: 032c779d3c1455ba34603999445b3d26afebd5dd
https://github.com/okfn/ckan/commit/032c779d3c1455ba34603999445b3d26afebd5dd
Author: amercader <amercadero at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/config/routing.py
R ckan/controllers/datastore.py
M ckan/controllers/package.py
R ckan/templates/package/resource_api_data.html
M ckan/templates/package/snippets/data_api_button.html
R ckan/tests/functional/test_datastore.py
Log Message:
-----------
Merge branch '362-remove-old-datastore'
Conflicts:
ckan/templates/package/snippets/data_api_button.html
Commit: f8089c9598ff26f07b05eb7a24faf75175f333db
https://github.com/okfn/ckan/commit/f8089c9598ff26f07b05eb7a24faf75175f333db
Author: amercader <amercadero at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/admin.py
R ckan/templates/admin/authz.html
M ckan/templates/admin/snippets/header.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 9dd058ef8f9441f5f6d0f8da5916a2812cff711c
https://github.com/okfn/ckan/commit/9dd058ef8f9441f5f6d0f8da5916a2812cff711c
Author: John Martin <me at johnmart.in>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/member_new.html
Log Message:
-----------
Small template tweaks
Commit: be6c301ddf4df488f34c76d1fb9f7548252ac902
https://github.com/okfn/ckan/commit/be6c301ddf4df488f34c76d1fb9f7548252ac902
Author: John Martin <me at johnmart.in>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/new_authz.py
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
Log Message:
-----------
Adds helper text and other tweaks to templates
Commit: 01c7cc9bc146d58438e3c4b1119c09f958d62257
https://github.com/okfn/ckan/commit/01c7cc9bc146d58438e3c4b1119c09f958d62257
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
Use ordered dict
Commit: 4c147ad0474a8d8babd6981cc0b5e2489e14307c
https://github.com/okfn/ckan/commit/4c147ad0474a8d8babd6981cc0b5e2489e14307c
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/logic/action/get.py
M ckan/new_authz.py
M ckan/templates/organization/members.html
Log Message:
-----------
Translate roles
Commit: d9022c754798acb872b2dc8ddb788cb69ae90360
https://github.com/okfn/ckan/commit/d9022c754798acb872b2dc8ddb788cb69ae90360
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Fix default role
Commit: 65e00131e7786e9233cad23aaa65a3028a2599e8
https://github.com/okfn/ckan/commit/65e00131e7786e9233cad23aaa65a3028a2599e8
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/new_authz.py
Log Message:
-----------
Get proper role for member edit
Commit: 31d384534bdf3400d39641d4b7ca530ac0a3c25a
https://github.com/okfn/ckan/commit/31d384534bdf3400d39641d4b7ca530ac0a3c25a
Author: John Martin <me at johnmart.in>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/templates/organization/members.html
Log Message:
-----------
Tweaked column width for after boostrap upgrade from master
Commit: 14716b77366f14d6689ea46cf0ec6e5b8b6e021b
https://github.com/okfn/ckan/commit/14716b77366f14d6689ea46cf0ec6e5b8b6e021b
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Fix user dict issue
Commit: 2cce94ae6885675719909bebf0caebc89b73d31b
https://github.com/okfn/ckan/commit/2cce94ae6885675719909bebf0caebc89b73d31b
Author: tobes <toby.junk at gmail.com>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/admin.py
R ckan/controllers/datastore.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/logic/action/get.py
M ckan/new_authz.py
R ckan/templates/admin/authz.html
M ckan/templates/admin/snippets/header.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
R ckan/templates/package/resource_api_data.html
M ckan/templates/package/snippets/data_api_button.html
R ckan/tests/functional/test_datastore.py
Log Message:
-----------
Merge branch 'master' into 262-improve-helper-imports
Conflicts:
ckan/tests/functional/test_datastore.py
no longer exists so deleted
Compare: https://github.com/okfn/ckan/compare/3ae0ad1dc590...2cce94ae6885
More information about the ckan-changes
mailing list