Commit Graph

639 Commits

Author SHA1 Message Date
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
kindly 23aa45cc71 Merge branch '2.0-dataset-sources' into source_extra_config_validation 2013-03-06 01:10:48 +00:00
amercader d9a71f7c59 [#7] Fix wrong finish date on job listing 2013-03-05 18:56:30 +00:00
John Martin e566c96d62 [#7] Adds new harvest source button 2013-03-05 16:06:04 +00:00
John Martin 7544d5c5ef [#7] Removed faceted navigation for uneeded toggles in job reports 2013-03-05 15:23:42 +00:00
joetsoi e64c8ead0f fix print gather_errors 2013-03-05 12:49:20 +00:00
amercader 574c69fa9c Merge branch '2.0-dataset-sources' into 7-harvest-source-templates 2013-03-01 17:55:16 +00:00
amercader 182fbf054a Add XML declaration to contents if not present 2013-03-01 17:25:35 +00:00
amercader 5c17a525c1 Refresh session after each harvest stage
Otherwise the eg the source config got cached and you needed to restart
the consumers to refresh it.
2013-03-01 12:55:59 +00:00
amercader bd128ab58b Refresh session after each harvest stage
Otherwise the eg the source config got cached and you needed to restart
the consumers to refresh it.
2013-03-01 12:52:58 +00:00
amercader 1f2467af33 Merge branch 'source_extra_config_validation' into 7-harvest-source-templates 2013-03-01 12:52:30 +00:00
amercader 3b6468b181 Merge branch '2.0-dataset-sources' of github.com:okfn/ckanext-harvest into 2.0-dataset-sources 2013-03-01 12:51:17 +00:00
joetsoi 9432368bea fix gather_stage if there is a previous job
change check on gather stage to check for changed packages since
last job instead of current harvest job's gather_start

fix attribute look up bug

fix print_job to print 0 gather_errors instead of key error
2013-02-28 19:06:21 +00:00
joetsoi ffce2c7915 Merge branch '2.0-dataset-sources' of github.com:okfn/ckanext-harvest into 2.0-dataset-sources 2013-02-28 18:11:12 +00:00
amercader 217d58d3a4 Merge branch 'source_extra_config_validation' of github.com:okfn/ckanext-harvest into source_extra_config_validation 2013-02-28 16:03:27 +00:00
amercader f28dc97f79 Fix bug in harvest job reports 2013-02-28 15:47:56 +00:00
amercader 5b0b6a4b8b Fix bug in harvest job reports 2013-02-28 15:47:48 +00:00
amercader dab98112dc Fix bug in harvest job reports 2013-02-28 15:47:35 +00:00
kindly 871576f89c Merge remote-tracking branch 'remotes/origin/source_extra_config_validation' into source_extra_config_validation 2013-02-28 13:48:58 +00:00
kindly 9cef777e7b make sure config is also on top level 2013-02-28 13:46:16 +00:00
amercader e82410724a Merge branch '7-harvest-source-templates' into source_extra_config_validation 2013-02-28 12:18:09 +00:00
amercader f7cba69fe6 Merge branch '2.0-dataset-sources' into 7-harvest-source-templates 2013-02-28 12:17:47 +00:00
amercader a86d91c3f0 [#11] Make get actions side_effect_free 2013-02-28 12:17:15 +00:00