[ckan-changes] [okfn/ckan] 835e4f: [#370] Add 'state' to db_to_form_package_schema
GitHub
noreply at github.com
Thu Mar 28 19:17:46 UTC 2013
Branch: refs/heads/release-v2.0
Home: https://github.com/okfn/ckan
Commit: 835e4f4cdf58047b09c11a2bd470da46af79ebd1
https://github.com/okfn/ckan/commit/835e4f4cdf58047b09c11a2bd470da46af79ebd1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#370] Add 'state' to db_to_form_package_schema
Fixes #370
Commit: 80714b56d08087d171b2e3d5fe626d0749da21a9
https://github.com/okfn/ckan/commit/80714b56d08087d171b2e3d5fe626d0749da21a9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#375] Add isopen, license_url, license_title to db_to_form_package_schema
Fixes #375
Commit: fc61614cd56623681e6b3b4b7589be3cf5ee453a
https://github.com/okfn/ckan/commit/fc61614cd56623681e6b3b4b7589be3cf5ee453a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#372] Add group description to db_to_form_package_schema
Fixes #372
Commit: ec8f69ccd38240cc48a45dfde9a797624cf6c49e
https://github.com/okfn/ckan/commit/ec8f69ccd38240cc48a45dfde9a797624cf6c49e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add default_tags_schema to form_to_db_package_schema
This fixes lots of "input field __junk was not expected" when running
the ckan tests with an IDatasetForm plugin active (and hence the
form_to_db package validation active).
Commit: b6ccfca272fc14cc4fa19e8be320c2456423a986
https://github.com/okfn/ckan/commit/b6ccfca272fc14cc4fa19e8be320c2456423a986
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#390] Don't put api version in context when creating datasets in web ui
The form_to_db_schema() methods of IDatasetForm plugins were not getting
called when creating datasets in the web interface, if the IDatasetForm
plugin inherits from DefaultDatasetForm.
The reason was that DefaultDatasetForm's form_to_db_schema() method
deliberately doesn't call the method if the dataset is being created via
the API, and the package controller's new_resources() and new_metadata()
methods (for the new three-stage dataset creation) put the API version
in the context, so DefaultDatasetForm thinks it's being used over the
API.
Change the package controller to not put the API version in the context.
Fixes #390.
Commit: 9f39dbf6f57eb52d4af3e70a043c6e88babeea2e
https://github.com/okfn/ckan/commit/9f39dbf6f57eb52d4af3e70a043c6e88babeea2e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/model/activity.py
M ckan/public/base/css/main.css
A ckan/public/base/images/dashboard-followee-related.png
A ckan/public/base/images/full-width-nav-right.png
M ckan/public/base/javascript/modules/dashboard.js
M ckan/public/base/javascript/modules/data-viewer.js
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/less/dashboard.less
M ckan/public/base/less/masthead.less
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/ajax_snippets/api_info.html
M ckan/templates/ajax_snippets/popover_context_group.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/home/index.html
A ckan/templates/snippets/popover_context.html
M ckan/templates/user/dashboard.html
A ckan/templates/user/snippets/followee_dropdown.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/lib/test_dictization.py
M ckanext/reclinepreview/theme/public/preview_recline.js
M ckanext/reclinepreview/theme/public/resource.config
A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.js
R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.js
R ckanext/reclinepreview/theme/public/vendor/backbone/backbone.min.js
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.js
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.css
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.css
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings-white.png
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/img/glyphicons-halflings.png
R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.js
R ckanext/reclinepreview/theme/public/vendor/bootstrap/bootstrap.min.js
R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.css
R ckanext/reclinepreview/theme/public/vendor/bootstrap/css/bootstrap.min.css
R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings-white.png
R ckanext/reclinepreview/theme/public/vendor/bootstrap/img/glyphicons-halflings.png
A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.js
A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.js
R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.js
R ckanext/reclinepreview/theme/public/vendor/flotr2/excanvas.min.js
M ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.js
R ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.js
R ckanext/reclinepreview/theme/public/vendor/jquery.mustache/jquery.mustache.min.js
A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.js
A ckanext/reclinepreview/theme/public/vendor/json/json2.js
R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/layers.png
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.css
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.js
R ckanext/reclinepreview/theme/public/vendor/leaflet/images/layers.png
R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-icon.png
R ckanext/reclinepreview/theme/public/vendor/leaflet/images/marker-shadow.png
R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-in.png
R ckanext/reclinepreview/theme/public/vendor/leaflet/images/zoom-out.png
R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.css
R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.css
R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.ie.min.css
R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.js
R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.css
R ckanext/reclinepreview/theme/public/vendor/leaflet/leaflet.min.js
A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.js
R ckanext/reclinepreview/theme/public/vendor/moment/moment.js
R ckanext/reclinepreview/theme/public/vendor/moment/moment.min.js
A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.js
R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.js
R ckanext/reclinepreview/theme/public/vendor/mustache/mustache.min.js
R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.css
R ckanext/reclinepreview/theme/public/vendor/recline/css/recline.min.css
A ckanext/reclinepreview/theme/public/vendor/recline/recline.css
A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
R ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.js
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/README.txt
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/calendar.gif
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-asc.gif
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/images/sort-desc.gif
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.css
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.js
R ckanext/reclinepreview/theme/public/vendor/slickgrid/MIT-LICENSE.txt
R ckanext/reclinepreview/theme/public/vendor/slickgrid/README.txt
R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-asc.gif
R ckanext/reclinepreview/theme/public/vendor/slickgrid/images/sort-desc.gif
R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.js
R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.js
R ckanext/reclinepreview/theme/public/vendor/slickgrid/jquery.event.drag-2.0.min.js
R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.css
R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.js
R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.css
R ckanext/reclinepreview/theme/public/vendor/slickgrid/slick.grid.min.js
A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.css
A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.png
A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.js
A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.js
A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.js
R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.js
R ckanext/reclinepreview/theme/public/vendor/underscore/underscore.min.js
M ckanext/reclinepreview/theme/templates/recline.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into idatasetform-fixes
Commit: 0f7d6a25db1aa63eddd23f2a2998b0182c880674
https://github.com/okfn/ckan/commit/0f7d6a25db1aa63eddd23f2a2998b0182c880674
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
Fix DefaultDatasetForm's check_data_dict()
Some recent commits (I think maybe ec8f69c and b6ccfca) caused
DefaultDatasetForm's check_data_dict() method to start raising Integrity
Error when creating a dataset using the web ui. Make check_data_dict() a
bit more liberal so it doesn't raise these errors anymore.
Commit: a60428e4a0aa1562898a4a97c0d283b4b2ba2ece
https://github.com/okfn/ckan/commit/a60428e4a0aa1562898a4a97c0d283b4b2ba2ece
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-14 (Thu, 14 Feb 2013)
Changed paths:
M ckan/tests/functional/test_package.py
Log Message:
-----------
Update a couple of tests broken by commit 0f7d6a2
These tests relied on DefaultDatasetForm's check_data_dict throwing an
error, but since commit 0f7d6a2 made check_data_dict more liberal it
wasn't throwing the error anymore, tweak the tests to submit forms that
check_data_dict will still throw an error for.
Commit: c7d06ba96bc28b8ef9c9d637dbfc4569b99038cc
https://github.com/okfn/ckan/commit/c7d06ba96bc28b8ef9c9d637dbfc4569b99038cc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/controllers/related.py
M ckan/lib/activity_streams.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/plugins/core.py
R ckan/public/base/javascript/modules/popover-context.min.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/main.less
R ckan/public/base/less/popover-context.less
M ckan/public/base/vendor/resource.config
R ckan/templates/ajax_snippets/popover_context_dataset.html
R ckan/templates/ajax_snippets/popover_context_group.html
R ckan/templates/ajax_snippets/popover_context_user.html
M ckan/templates/related/dashboard.html
A ckan/templates/snippets/context.html
A ckan/templates/snippets/context/dataset.html
A ckan/templates/snippets/context/group.html
A ckan/templates/snippets/context/user.html
R ckan/templates/snippets/popover_context.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/snippets/followers.html
M ckanext/reclinepreview/theme/public/preview_recline.js
R ckanext/reclinepreview/theme/public/preview_recline.min.js
A ckanext/reclinepreview/theme/public/vendor/backbone/0.9.2/backbone.min.js
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/bootstrap.min.js
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap-responsive.min.css
A ckanext/reclinepreview/theme/public/vendor/bootstrap/2.0.2/css/bootstrap.min.css
A ckanext/reclinepreview/theme/public/vendor/flot/excanvas.min.js
A ckanext/reclinepreview/theme/public/vendor/flot/jquery.flot.min.js
A ckanext/reclinepreview/theme/public/vendor/flotr2/flotr2.min.js
A ckanext/reclinepreview/theme/public/vendor/jquery/1.7.1/jquery.min.js
A ckanext/reclinepreview/theme/public/vendor/json/json2.min.js
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
R ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster-src.js
M ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
A ckanext/reclinepreview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
A ckanext/reclinepreview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
A ckanext/reclinepreview/theme/public/vendor/moment/1.6.2/moment.min.js
A ckanext/reclinepreview/theme/public/vendor/mustache/0.5.0-dev/mustache.min.js
A ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
A ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
A ckanext/reclinepreview/theme/public/vendor/showdown/20120615/showdown.min.js
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.css
A ckanext/reclinepreview/theme/public/vendor/slickgrid/2.0.1/slick.grid.min.js
A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/css/timeline.min.css
A ckanext/reclinepreview/theme/public/vendor/timeline/20120520/js/timeline.min.js
A ckanext/reclinepreview/theme/public/vendor/underscore.deferred/0.4.0/underscore.deferred.min.js
A ckanext/reclinepreview/theme/public/vendor/underscore/1.4.2/underscore.min.js
M doc/writing-extensions.rst
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into idatasetform-fixes
Commit: fef13ac3a11b2eed016c490e6df48c563ce20c14
https://github.com/okfn/ckan/commit/fef13ac3a11b2eed016c490e6df48c563ce20c14
Author: Ian Ward <ian at excess.org>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/lib/navl/dictization_functions.py
Log Message:
-----------
default to not-broken navl validation
But, frankly all of pull request #2671 is suspect
Commit: ecfacbbc41d85bc4a83bd3ac008f185ec31b9185
https://github.com/okfn/ckan/commit/ecfacbbc41d85bc4a83bd3ac008f185ec31b9185
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#406] Don't strip id's from extras in validate()
db_to_form_package_schema() (which is only used if an IDatasetForm
plugin is active) was stripping the "id" keys from package extras, which
then causes some tests to fail. Not sure if just the tests were
crashing, or if some ckan pages were also crashing. Anyway, this commit
means they don't get stripped anymore.
Fixes #406
Commit: e6acbd4bc64580604d88d01c794db14911f5c258
https://github.com/okfn/ckan/commit/e6acbd4bc64580604d88d01c794db14911f5c258
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Revert "[#406] Don't strip id's from extras in validate()"
This reverts commit ecfacbbc41d85bc4a83bd3ac008f185ec31b9185.
It's fine to strip IDs from extras, extra IDs are never useful or needed
by users. Any tests that are failing (or templates that are crashing,
etc.) by trying to read extra IDs should be fixed to not read extra IDs.
Commit: d176b49636b488ff246107d4d58ec4be9dade8c8
https://github.com/okfn/ckan/commit/d176b49636b488ff246107d4d58ec4be9dade8c8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-15 (Fri, 15 Feb 2013)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
[#406] Fix some broken tests
These tests were failing when run with an IDatasetForm plugin active
because they're trying to read extra IDs, which they shouldn't do.
Change the tests to not read extra IDs, now they pass.
See commits ecfacbbc4 and e6acbd4bc645.
Commit: 2d6489060e51d7ccac3d1e7c55cb040c90502340
https://github.com/okfn/ckan/commit/2d6489060e51d7ccac3d1e7c55cb040c90502340
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#407] db_to_form_package_schema don't strip keys
Add empty lists to db_to_form_package_schema() for several keys that
normally appear in dicts from package_show, but that were being stripped
from thos dicts when db_to_form_package_schema() was used (i.e. when an
IDatasetForm plugin was active). Fixes #407.
Commit: 717167cfb94f12ad557bc3835e73985cd8fdb642
https://github.com/okfn/ckan/commit/717167cfb94f12ad557bc3835e73985cd8fdb642
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#415] db_to_form_package_schema() don't strip keys from resource dicts
Add several keys to the 'resources' subschema in
db_to_form_package_schema() so that validation doesn't strip the keys
from the resources dicts. This fixes a test that was failing if run with
an IDatasetForm plugin active, and may also fix some template crashes
when an IDatasetForm plugin is active if people are accessing these
resource keys in their templates.
Fixes #415.
Commit: aaa10bbff6e4c704e58f651f13b5b18cfa0a2571
https://github.com/okfn/ckan/commit/aaa10bbff6e4c704e58f651f13b5b18cfa0a2571
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Remove free_tags_only from db_to_form_package_schema()
Remove the free_tags_only converter from db_to_form_package_schema's
tags subschema.
This fixes a couple of tag vocabularies tests that were failing.
Not sure if this at the same time breaks something that we don't have
tests for, we may have to put this back in later if we find a problem.
Commit: b39fd05466ca53a869948810fb00fefff9f6c276
https://github.com/okfn/ckan/commit/b39fd05466ca53a869948810fb00fefff9f6c276
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Delete some unhelpful comments
Not clear what these comments mean or whether it's still true.
Commit: b0ad742736a3a8481b8d8967c5f0236850c4db32
https://github.com/okfn/ckan/commit/b0ad742736a3a8481b8d8967c5f0236850c4db32
Author: Ian Ward <ian at excess.org>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/lib/navl/dictization_functions.py
Log Message:
-----------
navl.validate: unflatten before restoring empty lists
Commit: 320696932d9d1e59d5963f8e586ce0432359b0dd
https://github.com/okfn/ckan/commit/320696932d9d1e59d5963f8e586ce0432359b0dd
Author: Ian Ward <ian at excess.org>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/lib/navl/dictization_functions.py
Log Message:
-----------
navl.validate: fix key names in restored empty lists
Commit: e78eb14a493601ec989855f1b3f6e1ca8a2222a3
https://github.com/okfn/ckan/commit/e78eb14a493601ec989855f1b3f6e1ca8a2222a3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#375] Add license_title back to db_to_form_package_schema()
Looks like this got removed by accident, so license titles weren't
showing on dataset pages.
Commit: 4fc12b1803c69b87ff7117a36a89b4af79715112
https://github.com/okfn/ckan/commit/4fc12b1803c69b87ff7117a36a89b4af79715112
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Revert "Remove free_tags_only from db_to_form_package_schema()"
This reverts commit aaa10bbff6e4c704e58f651f13b5b18cfa0a2571.
The free_tags_only converter is needed after all, because it prevents
vocab tags from appearing as normal tags on the dataset read and search
pages.
Reverting aaa10bbf means that a couple of tests are failing, but I think
it's the tests that are wrong not the code.
Commit: 19d79183b86857bcd472da0a08239c401267be80
https://github.com/okfn/ckan/commit/19d79183b86857bcd472da0a08239c401267be80
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/lib/app_globals.py
M ckan/public/base/css/main.css
M ckan/public/base/less/dataset.less
M ckan/templates/footer.html
M ckan/templates/package/read.html
M ckan/templates/snippets/package_item.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into idatasetform-fixes
Commit: e023d8a5f50baf3931e2610eaa433b5653227154
https://github.com/okfn/ckan/commit/e023d8a5f50baf3931e2610eaa433b5653227154
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-18 (Mon, 18 Feb 2013)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#417] Don't pass api version to form_to_db_schema_options()
Fixes #417.
Commit: b983791d3142f440ee06b0fdba5c8f9e4d663965
https://github.com/okfn/ckan/commit/b983791d3142f440ee06b0fdba5c8f9e4d663965
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
Revert "[#417] Don't pass api version to form_to_db_schema_options()"
This reverts commit e023d8a5f50baf3931e2610eaa433b5653227154.
e023d8a5 was the wrong fix and broke a bunch of tests, package_update()
was only passing 'api': True if it was in fact called via the api, which
is what it should do.
The real bug is in the package controller's _save_edit() method, which
puts the api version in the context even though it's a web ui method not
an api method. I'll fix that in the next commit...
Commit: 8c3a775e67646909f6ab2343f668bca3d1e93603
https://github.com/okfn/ckan/commit/8c3a775e67646909f6ab2343f668bca3d1e93603
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#417] Package controller: Don't put api version in context on package update
Don't put 'api_version' in the request context when calling
package_update() from the package controller, it makes package_update()
think it's being called by the api when in fact it's being called by the
web ui, and that then breaks IDatasetForm.
Commit: ff4f03d24ba7d61af8c20a67f85e2203bf06217b
https://github.com/okfn/ckan/commit/ff4f03d24ba7d61af8c20a67f85e2203bf06217b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
Add some more surplus keys to DefaultDatasetForm
Add some more surplus keys to DefaultDatasetForm's check_data_dict(),
this fixes a crash when updating a package over the web ui when an
IDatasetForm plugin is active.
Commit: 8f86134ae5c4475ce0c41fbd281e648783dcfef7
https://github.com/okfn/ckan/commit/8f86134ae5c4475ce0c41fbd281e648783dcfef7
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/base/css/main.css
M ckan/public/base/images/ckan-logo-footer.png
M ckan/public/base/images/ckan-logo.png
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
M ckan/public/base/less/dashboard.less
M ckan/public/base/less/dataset.less
A ckan/public/base/less/font-awesome.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/icons.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/main.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/module.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/toolbar.less
M ckan/public/base/less/variables.less
R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
R ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
A ckan/public/base/vendor/bootstrap/js/.jshintrc
R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
R ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap.js
A ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
M ckan/public/base/vendor/bootstrap/less/accordion.less
M ckan/public/base/vendor/bootstrap/less/alerts.less
M ckan/public/base/vendor/bootstrap/less/bootstrap.less
M ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
M ckan/public/base/vendor/bootstrap/less/button-groups.less
M ckan/public/base/vendor/bootstrap/less/buttons.less
M ckan/public/base/vendor/bootstrap/less/carousel.less
M ckan/public/base/vendor/bootstrap/less/close.less
M ckan/public/base/vendor/bootstrap/less/code.less
M ckan/public/base/vendor/bootstrap/less/component-animations.less
M ckan/public/base/vendor/bootstrap/less/dropdowns.less
M ckan/public/base/vendor/bootstrap/less/forms.less
M ckan/public/base/vendor/bootstrap/less/grid.less
M ckan/public/base/vendor/bootstrap/less/hero-unit.less
M ckan/public/base/vendor/bootstrap/less/labels-badges.less
M ckan/public/base/vendor/bootstrap/less/layouts.less
A ckan/public/base/vendor/bootstrap/less/media.less
M ckan/public/base/vendor/bootstrap/less/mixins.less
M ckan/public/base/vendor/bootstrap/less/modals.less
M ckan/public/base/vendor/bootstrap/less/navbar.less
M ckan/public/base/vendor/bootstrap/less/navs.less
M ckan/public/base/vendor/bootstrap/less/pager.less
M ckan/public/base/vendor/bootstrap/less/pagination.less
M ckan/public/base/vendor/bootstrap/less/popovers.less
M ckan/public/base/vendor/bootstrap/less/progress-bars.less
M ckan/public/base/vendor/bootstrap/less/reset.less
M ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
M ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
M ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
M ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
M ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
M ckan/public/base/vendor/bootstrap/less/responsive.less
M ckan/public/base/vendor/bootstrap/less/scaffolding.less
M ckan/public/base/vendor/bootstrap/less/sprites.less
M ckan/public/base/vendor/bootstrap/less/tables.less
A ckan/public/base/vendor/bootstrap/less/tests/buttons.html
A ckan/public/base/vendor/bootstrap/less/tests/css-tests.css
A ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
A ckan/public/base/vendor/bootstrap/less/tests/forms-responsive.html
A ckan/public/base/vendor/bootstrap/less/tests/forms.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
A ckan/public/base/vendor/bootstrap/less/tests/navbar.html
M ckan/public/base/vendor/bootstrap/less/thumbnails.less
M ckan/public/base/vendor/bootstrap/less/tooltip.less
M ckan/public/base/vendor/bootstrap/less/type.less
M ckan/public/base/vendor/bootstrap/less/utilities.less
M ckan/public/base/vendor/bootstrap/less/variables.less
M ckan/public/base/vendor/bootstrap/less/wells.less
M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
A ckan/public/base/vendor/font-awesome/css/font-awesome.css
A ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
A ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
R ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
M ckan/public/base/vendor/font-awesome/less/font-awesome.less
M ckan/public/base/vendor/resource.config
M ckan/templates/dataviewer/snippets/no_preview.html
M ckan/templates/development/snippets/list.html
M ckan/templates/development/snippets/nav.html
M ckan/templates/development/snippets/toolbar.html
M ckan/templates/group/index.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/macros/form.html
M ckan/templates/organization/index.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/snippets/data_api_button.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/related/base_form_page.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/home_breadcrumb_item.html
M ckan/templates/user/dashboard.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into idatasetform-fixes
Commit: 95035634426d98119a3768774db0985abc025b96
https://github.com/okfn/ckan/commit/95035634426d98119a3768774db0985abc025b96
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/tests/functional/test_package.py
Log Message:
-----------
[#417] Update a couple of tests broken by commit e023d8a
Commit: 34d9d660b50488a97cfa2d1af5281390017ee5af
https://github.com/okfn/ckan/commit/34d9d660b50488a97cfa2d1af5281390017ee5af
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#396] Add a comment
Commit: 62045e095b037679bb5aebe59a318d7617c0f572
https://github.com/okfn/ckan/commit/62045e095b037679bb5aebe59a318d7617c0f572
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-02-19 (Tue, 19 Feb 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#396] Delete a commented-out line
Commit: 3f01930906ede4a18f5ddf3bdf69e0380b76f668
https://github.com/okfn/ckan/commit/3f01930906ede4a18f5ddf3bdf69e0380b76f668
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/controllers/package.py
M ckan/logic/schema.py
Log Message:
-----------
Merge branch 'idatasetform-fixes' into idatasetform-fixes-branched-off-release-v2.0
Conflicts:
ckan/controllers/package.py
ckan/lib/plugins.py
ckan/logic/schema.py
Commit: 3031790a61bf4915062dca9691f8b487f9836d0a
https://github.com/okfn/ckan/commit/3031790a61bf4915062dca9691f8b487f9836d0a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
A ckanext/example_idatasetform/__init__.py
A ckanext/example_idatasetform/plugin.py
A ckanext/example_idatasetform/templates/package/new_package_metadata.html
A ckanext/example_idatasetform/templates/package/read.html
A ckanext/example_idatasetform/templates/package/snippets/package_form.html
A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
A ckanext/example_idatasetform/templates/package/snippets/package_metadata_form.html
M setup.py
Log Message:
-----------
[#2750] Add ckanext/example_idatasetform
Commit: 0dfef96bfd002546c70b530c99676ee03ba47cb1
https://github.com/okfn/ckan/commit/0dfef96bfd002546c70b530c99676ee03ba47cb1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/lib/plugins.py
M ckan/plugins/interfaces.py
M doc/conf.py
Log Message:
-----------
[#2750] Improve IDatasetForm docstrings
- Rewrite the IDatasetForm docstrings to make them clearer,
and conform to PEP257
- Reorder methods in IDatasetForm and DefaultDatasetForm
so that they're 1. in a more logical order and 2. in the
same order as eachother
- Tell autodoc to put the methods in source-code order,
not alphabetical, in the sphinx docs
- Remove docstrings from DefaultDatasetForm that are
exact repeats of corresponding docstrings in IDatasetForm
- Add edit_template() to IDatasetForm, it was missing
db_to_form_schema_options() and form_to_db_schema_options() and some
other schema methods in DefaultDatasetForm are still missing from
IDatasetForm but I'm leaving it that way for now, consider them
unofficial.
Commit: cdfe65dfb83b46508856c8475e61ea462312a796
https://github.com/okfn/ckan/commit/cdfe65dfb83b46508856c8475e61ea462312a796
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
R doc/forms.rst
M doc/index.rst
Log Message:
-----------
[#2750] Delete 'Customizing Forms' docs
They are out of date, and we have ckanext/example_idatasetform instead
now.
Commit: fe06841f28def4783f7ffd5f0d848c3a81bd0698
https://github.com/okfn/ckan/commit/fe06841f28def4783f7ffd5f0d848c3a81bd0698
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M doc/tag-vocabularies.rst
Log Message:
-----------
[#2750] Rewrite tag vocabularies docs
Change the tag vocabularies docs to refer to the working example in
ckanext/example_idatasetform instead of providing their own detailed
instructions.
Also add some more general explanation at the start about what tag
vocabularies are for/why you might want to use them/what you can do with
them, it was all a bit mysterious.
Remove some false claims from the Properties section, I don't think that
the restricted/free vocabulary types are implemented (they are either
always restricted or always free, can't remember), vocabularies do not
have descriptions.
Conflicts:
doc/tag-vocabularies.rst
Commit: 6604a1fe1fa2ed6890b34563a3c647378ae4ff6d
https://github.com/okfn/ckan/commit/6604a1fe1fa2ed6890b34563a3c647378ae4ff6d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/plugins.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/plugins/interfaces.py
M ckan/tests/functional/test_package.py
M ckanext/example_idatasetform/plugin.py
Log Message:
-----------
[#602] Deprecate IDatasetForm's check_data_dict
With the new three-stage dataset creation form in CKAN 2.0
check_data_dict() no longer works as intended. For example,
DefaultDatasetForm's check_data_dict() breaks any IDatasetForm plugins
that are trying to use convert_to_extras() (if they inherit from
DefaultDatasetForm).
Remove the method from IDatasetForm and DefaultDatasetForm, but still
call the method in all the places it would previously have been called
_if_ the active IDatasetForm plugin has the method.
Also remove three tests that seem to be testing check_data_dict()'s
behaviours.
Note that in the existing code, check_data_dict() seems to be called
twice when creating a package, once by the package controller and once
by package_create(), and the two are inconsistent in the number of
params they expect check_data_dict() to take! On updating a package it's
called just once, by package_update(). I have preserved these "legacy"
behaviours.
Also note that IGroupForm and IOrganizationForm still have
check_data_dict() methods, we probably want to get rid of them in the
future as well.
Commit: 739a131c01fcc76c0568ccdf0fd971dc85226b54
https://github.com/okfn/ckan/commit/739a131c01fcc76c0568ccdf0fd971dc85226b54
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/plugins/toolkit.py
M ckanext/example_idatasetform/plugin.py
Log Message:
-----------
[#2750] Add DefaultDatasetForm to plugins toolkit
At DefaultDatasetForm to the plugins toolkit. This means that
IDatasetForm plugins based on DefaultDatasetForm no longer need to
import ckan.lib.plugins.
Also change ExampleIDatasetForm to no longer import ckan.lib.plugins.
Commit: b98ce9a4bc4538527b6829216340bca3d4c837e3
https://github.com/okfn/ckan/commit/b98ce9a4bc4538527b6829216340bca3d4c837e3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckanext/example_idatasetform/plugin.py
R ckanext/example_idatasetform/templates/package/new_package_metadata.html
R ckanext/example_idatasetform/templates/package/snippets/package_form.html
M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
R ckanext/example_idatasetform/templates/package/snippets/package_metadata_form.html
Log Message:
-----------
[#2750] Use ITemplateHelpers not setup_template_variables()
In ExampleIDatasetForm use ITemplateHelpers not
setup_template_variables() to pass the list of available country codes
to the template. This greatly reduces the number of templates that need
to be overridden!
Commit: 935f286cb77c02c7efc0680d88090838fd32773e
https://github.com/okfn/ckan/commit/935f286cb77c02c7efc0680d88090838fd32773e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckanext/example_idatasetform/plugin.py
Log Message:
-----------
[#2750] Move create_country_codes() to a better place
Move example_idatasetform's create_country_codes() to a better place.
Commit: 5f8b48b9f36e9c4ab39ecf6e9e354857d7c5cb09
https://github.com/okfn/ckan/commit/5f8b48b9f36e9c4ab39ecf6e9e354857d7c5cb09
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckanext/example_idatasetform/plugin.py
Log Message:
-----------
[#2750] Add setup_template_variables() back
Add setup_template_variables() back into ExampleIDatasetFormPlugin, just
counts how many times it gets called, for testing purposes.
Commit: 0fb9269996da9b70681dbdba05caa0a9397c0f1e
https://github.com/okfn/ckan/commit/0fb9269996da9b70681dbdba05caa0a9397c0f1e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckanext/example_idatasetform/plugin.py
Log Message:
-----------
[#2750] Use super()
Seems like the right thing to do
Commit: 2020054889eddbe9e87b8cadda0081deadf7384e
https://github.com/okfn/ckan/commit/2020054889eddbe9e87b8cadda0081deadf7384e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckanext/example_idatasetform/templates/package/read.html
Log Message:
-----------
[#2750] Change an HTML comment into a Jinja comment
Commit: 034f3ae64d6adf264791fed12fb3db57deaca752
https://github.com/okfn/ckan/commit/034f3ae64d6adf264791fed12fb3db57deaca752
Author: John Martin <me at johnmart.in>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/templates/package/snippets/package_metadata_fields.html
M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2750] Tweaks base package_metadata_fields.html and then {% ckan_extends %} from it.
Commit: afd9672e7acdd844b55b632bed033f96671937db
https://github.com/okfn/ckan/commit/afd9672e7acdd844b55b632bed033f96671937db
Author: John Martin <me at johnmart.in>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2750] Simplify the template yet more
Commit: 8e0b14459772ad72d51bf1dabb1346887e3c4881
https://github.com/okfn/ckan/commit/8e0b14459772ad72d51bf1dabb1346887e3c4881
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2750] Add custom_text_field back into example idatasetform templates
This field accidentally got removed from the templates in a previous
commit
Commit: 3d2a396affc29b4f02092550cc16d7a377b183bf
https://github.com/okfn/ckan/commit/3d2a396affc29b4f02092550cc16d7a377b183bf
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2750] Remove 'free extras' from package form in example idatasetform
This is necessary to make convert_to/from_extras() work
Commit: 23b9a8b510dcb8651cdf4b6875a9c5a102ae9e84
https://github.com/okfn/ckan/commit/23b9a8b510dcb8651cdf4b6875a9c5a102ae9e84
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/schema/test_schema.py
M ckanext/test_tag_vocab_plugin.py
Log Message:
-----------
[#649] Rename default_package_schema() -> _base_package_schema()
Also add a docstring.
This schema seems to be a base schema for other package schemas to be
based on, and a private helper function of schema.py. It's not used
outside of schema.py apart from by some tests that probably should not
be using it. The new name hopefully makes it clearer what the purpose of
this function is.
Conflicts:
ckan/tests/lib/test_dictization_schema.py
Commit: 5f9cceb5daaf2a23e1a6b4df5aa7332be7875af2
https://github.com/okfn/ckan/commit/5f9cceb5daaf2a23e1a6b4df5aa7332be7875af2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#649] Deprecate package_form_schema() properly
I think package_form_schema() was probably deprecated using a code
comment before we had the Right Way of deprecating things (using the
deprecated decorator).
Commit: 2b221ed9f5f6fd7f929f3598034921f1438ec167
https://github.com/okfn/ckan/commit/2b221ed9f5f6fd7f929f3598034921f1438ec167
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#649] Don't validate package dicts in package controller
The package_*() action functions handle fetching package schemas and
using them to validate package dicts, no need to also do it in the
package controller!
Conflicts:
ckan/controllers/package.py
Commit: 02c70b33ba5ab8be8485f936233411e666d7a9e9
https://github.com/okfn/ckan/commit/02c70b33ba5ab8be8485f936233411e666d7a9e9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#649] Delete package_create_validate()
Delete package_create_validate() action function.
This function has no docstring and no tests, and duplicates package dict
validation code in package_create().
Commit: bf60471d24ea4dfdb20bc91d42830fb0dcf5b948
https://github.com/okfn/ckan/commit/bf60471d24ea4dfdb20bc91d42830fb0dcf5b948
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#649] Delete package_update_validate()
Delete package_update_validate() action function.
This function has no docstring and no tests, and duplicates package dict
validation code in package_update().
Commit: 738551af03e2275d6296fafa2e8afef60b20dc0e
https://github.com/okfn/ckan/commit/738551af03e2275d6296fafa2e8afef60b20dc0e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/lib/plugins.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/schema/test_schema.py
M ckanext/test_tag_vocab_plugin.py
Log Message:
-----------
[#649] Refactor form_to_db_schema()
Replace form_to_db_schema(), form_to_db_schema_options(),
form_to_db_schema_api_create(), form_to_db_schema_api_update(),
form_to_db_package_schema() with just two schemas: create and update.
Then get the tests passing.
schema.py:
- Delete _base_package_schema()
- Delete already deprecated package_form_schema()
- Delete form_to_db_package_schema()
- Tweak default_create_package_schema() and
default_update_package_schema() to get tests passing
DefaultDatasetForm:
- Delete form_to_db_schema_options()
- Delete form_to_db_schema()
- Delete form_to_db_schema_api_create()
- Delete form_to_db_schema_api_update()
- Add create_package_schema(), returns None
- Add update_package_schema(), returns None
Note that by deleting form_to_db_schema() and
form_to_db_schema_options(), _api_create() and _api_update(), we're
breaking backwards compatibility with any plugins that were using these.
package_create():
- Don't call form_to_db_schema_options() or form_to_db_schema().
- Instead call the package plugin's create_package_schema(), if that
doesn't exist or if it returns None then call
default_create_package_schema() instead
package_update():
- Don't call form_to_db_schema_options() or form_to_db_schema().
- Instead call the package plugin's update_package_schema(), if that
doesn't exist or if it returns None then call
default_update_package_schema() instead
Note that by no longer calling the form_to_db_schema_options() or
form_to_db_schema() methods of IDatasetForm plugins, we're breaking
backward compatibility with those plugins.
Note this makes IDatasetForm less flexible - plugins can return
different schemas for creating, updating or showing packages, but they
can no longer return different schemas depending on whether we're using
the API or web UI, or on other parameters from the Pylons context.
test_tag_vocab.py:
- Update MockVocabTagsPlugin to work with the new interface
Also update some other tests.
Conflicts:
ckan/lib/plugins.py
Commit: ba32bd30b4def8b9bea864c9796d1309c55287a9
https://github.com/okfn/ckan/commit/ba32bd30b4def8b9bea864c9796d1309c55287a9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/lib/plugins.py
M ckan/logic/schema.py
M ckanext/test_tag_vocab_plugin.py
Log Message:
-----------
[#649] Rename db_to_form_package_schema() -> default_show_package_schema()
This makes the name consistent with default_create_package_schema() and
default_update_package_schema().
Conflicts:
ckan/lib/plugins.py
Commit: 8296dc6cad6a855f51ce53f8754b02161f81f378
https://github.com/okfn/ckan/commit/8296dc6cad6a855f51ce53f8754b02161f81f378
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/lib/plugins.py
M ckan/logic/action/get.py
M ckanext/test_tag_vocab_plugin.py
Log Message:
-----------
[#649] Get rid of form_to_db_schema_options()
package_show(): Don't call an IDatasetForm plugin's
db_to_form_schema_options() or db_to_form_schema() anymore, instead call
package_show_schema(), if the plugin doesn't have that method or if it
returns None then fall back on
ckan.logic.schema.default_package_show_schema(). (Same pattern as for
package_create() and package_update()).
Delete DefaultDatasetForm's db_to_form_schema_options() and
db_to_form_schema(), add show_package_schema() that just returns None,
same as create_package_schema() and update_package_schema().
Conflicts:
ckan/lib/plugins.py
Commit: d433adec307ea5963b9a93d13cf520085b8f4a9d
https://github.com/okfn/ckan/commit/d433adec307ea5963b9a93d13cf520085b8f4a9d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Remove unused _check_data_dict() from package controller
This method is never called
Conflicts:
ckan/controllers/package.py
Commit: 54578af0a4806b9798f24526e77111e32591ace1
https://github.com/okfn/ckan/commit/54578af0a4806b9798f24526e77111e32591ace1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#649] Remove schema-related hacks from package controller
These hacks are no longer needed
Commit: d52697bb965ab668585452afbf22dce156846719
https://github.com/okfn/ckan/commit/d52697bb965ab668585452afbf22dce156846719
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckanext/example_idatasetform/plugin.py
Log Message:
-----------
[#649] Update example_idatasetform to new IDatasetForm interface
This imports ckan.logic.schema which is bad.
Commit: a7c0ea2fe9fe775148f375a7311516248cff7440
https://github.com/okfn/ckan/commit/a7c0ea2fe9fe775148f375a7311516248cff7440
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/lib/plugins.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckanext/example_idatasetform/plugin.py
Log Message:
-----------
[#649] Make DefaultDatasetForm return default schemas
Make DefaultDatasetForm's create_package_schema(),
update_package_schema() and show_package_schema() methods return
default_create_package_schema(), default_update_package_schema() and
default_show_package_schema() from schema.py.
This makes it easier for plugins as they can just inherit from
DefaultDatasetForm and call super() to get the default schemas, they
don't need to import ckan.logic.schema to get them (or we don't need to
add the default schemas to the plugins toolkit).
This removes the logic, which was repeated in package_create(),
package_update() and package_show(), of getting the schema from the
plugin but if the plugin provided no schema then falling back on the default
one from schema.py. The action functions now simply get the schema from
plugin and always expect the plugin to provide the schema. The default
fallback behaviour is provided by plugins inheriting from
DefaultDatasetForm instead.
Commit: 9fc89290ece9b66f549b7fb8994779412fb5fb5a
https://github.com/okfn/ckan/commit/9fc89290ece9b66f549b7fb8994779412fb5fb5a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/plugins/interfaces.py
Log Message:
-----------
[#649] Update IDatasetForm docs
Commit: 59666bc09e96adf27c4b5c5db0769e0f5deb027b
https://github.com/okfn/ckan/commit/59666bc09e96adf27c4b5c5db0769e0f5deb027b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-21 (Thu, 21 Mar 2013)
Changed paths:
M ckan/controllers/package.py
M ckan/logic/schema.py
Log Message:
-----------
Fix merge issues
Fix a couple of issues that slipped in while trying to merge three
IDatasetForm-relared pull requests into
idatasetform-fixes-branched-off-release-v2.0.
This gets the tests passing.
Commit: 64a859aeca2d218c48d899c9ce3647daacbe248b
https://github.com/okfn/ckan/commit/64a859aeca2d218c48d899c9ce3647daacbe248b
Author: amercader <amercadero at gmail.com>
Date: 2013-03-28 (Thu, 28 Mar 2013)
Changed paths:
M ckan/controllers/tag.py
M ckan/lib/activity_streams_session_extension.py
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/search/index.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
M ckan/migration/versions/067_turn_extras_to_strings.py
M ckan/misc.py
M ckan/new_authz.py
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
M ckan/public/base/less/layout.less
M ckan/templates/home/about.html
M ckan/templates/package/new_package_metadata.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/snippets/license.html
A ckan/templates/tag/index.html
M ckan/tests/functional/api/model/test_vocabulary.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_activity.py
M ckan/tests/logic/test_auth.py
M ckan/tests/logic/test_member.py
M ckanext/datastore/bin/set_permissions.sql
R ckanext/organizations/__init__.py
R ckanext/organizations/controllers.py
R ckanext/organizations/forms.py
R ckanext/organizations/templates/email/join_publisher_request.txt
R ckanext/organizations/templates/organization_edit.html
R ckanext/organizations/templates/organizations/form.html
R ckanext/organizations/templates/organizations/index.html
R ckanext/organizations/templates/organizations/new.html
R ckanext/organizations/templates/organizations/read.html
R ckanext/organizations/templates/organizations/users.html
R ckanext/organizations/templates/organizations/users_form.html
R ckanext/organizations/templates_legacy/organizations/apply.html
R ckanext/organizations/templates_legacy/organizations/apply_form.html
R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
R ckanext/organizations/templates_legacy/organizations/form.html
R ckanext/organizations/templates_legacy/organizations/history.html
R ckanext/organizations/templates_legacy/organizations/index.html
R ckanext/organizations/templates_legacy/organizations/layout.html
R ckanext/organizations/templates_legacy/organizations/new.html
R ckanext/organizations/templates_legacy/organizations/package_form.html
R ckanext/organizations/templates_legacy/organizations/read.html
R ckanext/organizations/templates_legacy/organizations/users.html
R ckanext/organizations/templates_legacy/organizations/users_form.html
R doc/about.rst
R doc/administrative-dashboard.rst
M doc/configuration.rst
Log Message:
-----------
Merge branch 'release-v2.0' into idatasetform-fixes-branched-off-release-v2.0
Commit: 0fcea2dff1711696814906a8f024078a3bf8b266
https://github.com/okfn/ckan/commit/0fcea2dff1711696814906a8f024078a3bf8b266
Author: amercader <amercadero at gmail.com>
Date: 2013-03-28 (Thu, 28 Mar 2013)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/plugins.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/schema/test_schema.py
A ckanext/example_idatasetform/__init__.py
A ckanext/example_idatasetform/plugin.py
A ckanext/example_idatasetform/templates/package/read.html
A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
M ckanext/test_tag_vocab_plugin.py
M doc/conf.py
R doc/forms.rst
M doc/index.rst
M doc/tag-vocabularies.rst
M setup.py
Log Message:
-----------
Merge branch 'idatasetform-fixes-branched-off-release-v2.0' into release-v2.0
Commit: e639b9c0f1797f8c65ceb5d37a16a79bdc4a9efd
https://github.com/okfn/ckan/commit/e639b9c0f1797f8c65ceb5d37a16a79bdc4a9efd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-03-28 (Thu, 28 Mar 2013)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#713] Blockify package_basic_fields.html
Add a package_basic_fields_custom block to package_basic_fields.html,
which IDatasetForm plugins can use to add custom fields to the first
page of the new package form without duplicating any template code.
Update example_idatasetform to use this new block for one of its custom
fields.
Fixes #713.
Compare: https://github.com/okfn/ckan/compare/80750708a09b...e639b9c0f179
More information about the ckan-changes
mailing list