Commit Graph

611 Commits

Author SHA1 Message Date
John Martin 3197162fe6 [#25] Changed 'Refresh' to 'Reharvest' on button 2013-03-21 10:36:12 +00:00
kindly a7583a7b8b Merge branch 'release-v2.0' of https://github.com/okfn/ckanext-harvest into release-v2.0 2013-03-21 02:32:11 +00:00
kindly b676fb02e1 only get out harvest items in interface and when indexing 2013-03-21 02:31:34 +00:00
amercader 15c44d9aa8 Merge branch '23-harvest-form-cleanup' into release-v2.0 2013-03-20 17:03:41 +00:00
John Martin 4ba298fe58 [#23] Make labels a little wider on harvest new form 2013-03-20 14:07:03 +00:00
amercader 02e90767f4 Fix source listing in organization page
It needed update after #515 in ckan core
2013-03-20 13:01:23 +00:00
John Martin 86355fb9db [#23] Form cleanup after core bootstrap upgrade 2013-03-20 10:44:24 +00:00
kindly 634a0bbd30 return instead of continue 2013-03-19 01:21:20 +00:00
kindly 3adf38105e readd code from old branch seperating the fetch and import logic 2013-03-19 01:16:43 +00:00
amercader c2a6bd14eb Add auth function for harvest_source_show_status 2013-03-18 16:48:27 +00:00
amercader c76b7d95f3 Only count public datasets on the source status
This is more in line with what is done on the orgs/groups pages
2013-03-18 16:41:01 +00:00
amercader cb80ac784e Add logic to show private datasets to authorizaded users 2013-03-18 16:29:29 +00:00
amercader 341331ac53 Merge branch 'release-v2.0' of github.com:okfn/ckanext-harvest into release-v2.0 2013-03-14 17:33:21 +00:00
amercader d77f16aba9 [#21] Improve gather stage error handling
See issue for full details. Basically we don't want to catch any
exception at the queue.py level, as they prevent debugging. Harvesters
should deal with them and return a list of ids or an empty list if no
objects need to be fetched.
Also improved the debug messages.
2013-03-14 17:31:07 +00:00
John Martin b30cc54427 Fix for add harvest source button within org 2013-03-14 14:45:54 +00:00
amercader 91f18bffab Fix pagination on org sources listing 2013-03-14 11:44:38 +00:00
amercader 8cac0977aa Fix import on org sources listing 2013-03-14 11:44:22 +00:00
amercader cd6c1b56a8 [#18] Get package dict on after_delete to check type
No need for #615 in core then
2013-03-13 17:31:39 +00:00
amercader 1b11b00946 [#18] Fix wrong logic for setting the source active field 2013-03-13 13:19:43 +00:00
kindly cb5e06119e Merge branch 'release-v2.0' of https://github.com/okfn/ckanext-harvest into release-v2.0 2013-03-12 23:31:58 +00:00
kindly 06355ee6c4 Make IFacets work for harvest source related searches 2013-03-12 23:31:06 +00:00
amercader fab5b81c2c Pass context to functions handling harvest sources 2013-03-12 17:30:31 +00:00
amercader 2ed7966f72 Merge branch '18-delete-sources-for-2.0' into release-v2.0 2013-03-12 15:36:04 +00:00
amercader 5e50a5c9ad [#8] Update how state is handled for source objects 2013-03-12 15:35:49 +00:00
amercader 2ee3f33f51 [#18] Allow reactivation of sources
Due to #607 in CKAN core, once a source was deleted you could not
reactivate it again. As a workaround, if the source is deleted the
Delete button is not shown and the state select is, so you can set it to
'active'.
Also fixed wrong redirect after deletion.
2013-03-12 14:06:54 +00:00
amercader 23d1d5742c [#18] Update delete harvest source functionality
The harvest_source_delete logic function proxies to package delete,
which will delete the harvest source dataset. The harvest plugin then
hooks to the after_delete extension point in order to inactivate the
actual HarvestSource object and abort any pending jobs.
Also added the Delete button to the harvest source form.
2013-03-12 13:14:07 +00:00
amercader c957fdf17c Merge branch '14-template-tweaks' into release-v2.0 2013-03-08 14:49:43 +00:00
amercader ecceff48ed [#14] Use source.organization again after fix in 949bb6f 2013-03-08 14:48:49 +00:00
amercader 949bb6fe6a [#16] Add organization to source dict 2013-03-08 14:47:11 +00:00
John Martin f25ef19985 [#14] Fix for org breadcrumbs on sources 2013-03-08 12:48:11 +00:00
John Martin 2a53e4a2e4 [#14] Couple of minor template tweaks 2013-03-08 12:38:41 +00:00
joetsoi 7257258ca4 mark new harvest objects as current
When a new harvest_object for a new package was being created, it
was immediately being marked as false, as all objects were marked
as false, including the new object just created and newly marked
as current=true.

Fix so that old HarvestObjects are only marked as current=False
when updating an existing package.
2013-03-07 20:27:27 +00:00
John Martin 14e51ec587 Fix for removed snippet from ckan core 2013-03-07 11:52:59 +00:00
amercader 703339a49e Merge branch '2.0-dataset-sources' into release-v2.0 2013-03-06 17:03:26 +00:00
amercader 96e1cec1ac Merge branch '13-clean-up-before-2.0' into 2.0-dataset-sources 2013-03-06 17:02:13 +00:00
amercader 2ee27164c3 [#13] Remove or deprecate unused code
Mostly in controllers, dictization and plugin, either related to the old
templates pre-dataset type or old authorization.
2013-03-06 16:54:33 +00:00
amercader 6c02c87f8d [#13] Set routes to /harvest
Mostly painless as we (most of the time) were using DATASET_TYPE_NAME.
All old routes now point to the correct place in the new interface.
2013-03-06 16:33:46 +00:00
amercader 5cf2708b95 Merge branch '5-improve-job-errors-reporting' into 2.0-dataset-sources 2013-03-06 15:48:18 +00:00
amercader eda280f266 Merge branch '12-org-source-listing' into 2.0-dataset-sources 2013-03-06 15:45:45 +00:00
amercader 889325dd9c [#12] Clean up and rename organization controller 2013-03-06 15:43:10 +00:00
amercader e9adaa7f91 [#12] Change URL for org sources list
Use "/organization/harvest_source/{id}", which will turn into
"/organization/harvest/{id}" soon
2013-03-06 15:38:38 +00:00
amercader f15f458906 Merge branch '7-harvest-source-templates' into 2.0-dataset-sources 2013-03-06 15:21:46 +00:00
amercader 74633d0803 Fix error count in job stats
We want to take into account objects with errors that where created or
updated anyway (eg bbox errors), so we bascially query for the number of
objects that have object errors.

Also add the number of gather errors to this count.
2013-03-06 13:44:04 +00:00
amercader ef2defbcf9 [#7] Refactor job report page to include all errors 2013-03-06 13:43:40 +00:00
amercader bec31a611e Fix empty job finished date 2013-03-06 13:42:35 +00:00
amercader 04710fd1c6 Revert removal of filter in job list action in 7544d5c 2013-03-06 12:19:20 +00:00
John Martin c2b552b980 [#12] Better faceting for specifically harvest sources 2013-03-06 11:38:24 +00:00
John Martin 246898049e [#12] When harvest source listing is within org links goto edit pages 2013-03-06 11:36:24 +00:00
John Martin 9d149e4e5d [#12] Makes a harvest source admin page within org look a little nicer 2013-03-06 11:23:36 +00:00
kindly ca2df234d2 [#12] begin work on org harvest source controller 2013-03-06 04:11:31 +00:00